glibc-2.31.patch 3.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100
  1. From beee0ef61866cb567b9abc23bd850f922e59e3f0 Mon Sep 17 00:00:00 2001
  2. From: Darren Tucker <dtucker@dtucker.net>
  3. Date: Wed, 13 Nov 2019 23:19:35 +1100
  4. Subject: [PATCH] seccomp: Allow clock_nanosleep() in sandbox.
  5. seccomp: Allow clock_nanosleep() to make OpenSSH working with latest
  6. glibc. Patch from Jakub Jelen <jjelen@redhat.com> via bz #3093.
  7. ---
  8. sandbox-seccomp-filter.c | 6 ++++++
  9. 1 file changed, 6 insertions(+)
  10. diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
  11. index b5cda70bb..96ab141f7 100644
  12. --- a/sandbox-seccomp-filter.c
  13. +++ b/sandbox-seccomp-filter.c
  14. @@ -242,6 +242,12 @@ static const struct sock_filter preauth_insns[] = {
  15. #ifdef __NR_nanosleep
  16. SC_ALLOW(__NR_nanosleep),
  17. #endif
  18. +#ifdef __NR_clock_nanosleep
  19. + SC_ALLOW(__NR_clock_nanosleep),
  20. +#endif
  21. +#ifdef __NR_clock_nanosleep
  22. + SC_ALLOW(__NR_clock_nanosleep),
  23. +#endif
  24. #ifdef __NR__newselect
  25. SC_ALLOW(__NR__newselect),
  26. #endif
  27. From 69298ebfc2c066acee5d187eac8ce9f38c796630 Mon Sep 17 00:00:00 2001
  28. From: Darren Tucker <dtucker@dtucker.net>
  29. Date: Wed, 13 Nov 2019 23:27:31 +1100
  30. Subject: [PATCH] Remove duplicate __NR_clock_nanosleep
  31. ---
  32. sandbox-seccomp-filter.c | 3 ---
  33. 1 file changed, 3 deletions(-)
  34. diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
  35. index 96ab141f7..be2397671 100644
  36. --- a/sandbox-seccomp-filter.c
  37. +++ b/sandbox-seccomp-filter.c
  38. @@ -245,9 +245,6 @@ static const struct sock_filter preauth_insns[] = {
  39. #ifdef __NR_clock_nanosleep
  40. SC_ALLOW(__NR_clock_nanosleep),
  41. #endif
  42. -#ifdef __NR_clock_nanosleep
  43. - SC_ALLOW(__NR_clock_nanosleep),
  44. -#endif
  45. #ifdef __NR__newselect
  46. SC_ALLOW(__NR__newselect),
  47. #endif
  48. From 030b4c2b8029563bc8a9fd764288fde08fa2347c Mon Sep 17 00:00:00 2001
  49. From: Darren Tucker <dtucker@dtucker.net>
  50. Date: Mon, 16 Dec 2019 13:55:56 +1100
  51. Subject: [PATCH] Allow clock_nanosleep_time64 in seccomp sandbox.
  52. Needed on Linux ARM. bz#3100, patch from jjelen@redhat.com.
  53. ---
  54. sandbox-seccomp-filter.c | 3 +++
  55. 1 file changed, 3 insertions(+)
  56. diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
  57. index be2397671..3ef30c9d5 100644
  58. --- a/sandbox-seccomp-filter.c
  59. +++ b/sandbox-seccomp-filter.c
  60. @@ -245,6 +245,9 @@ static const struct sock_filter preauth_insns[] = {
  61. #ifdef __NR_clock_nanosleep
  62. SC_ALLOW(__NR_clock_nanosleep),
  63. #endif
  64. +#ifdef __NR_clock_nanosleep_time64
  65. + SC_ALLOW(__NR_clock_nanosleep_time64),
  66. +#endif
  67. #ifdef __NR__newselect
  68. SC_ALLOW(__NR__newselect),
  69. #endif
  70. From a991cc5ed5a7c455fefe909a30cf082011ef5dff Mon Sep 17 00:00:00 2001
  71. From: Khem Raj <raj.khem@gmail.com>
  72. Date: Tue, 7 Jan 2020 16:26:45 -0800
  73. Subject: [PATCH] seccomp: Allow clock_gettime64() in sandbox.
  74. This helps sshd accept connections on mips platforms with
  75. upcoming glibc ( 2.31 )
  76. ---
  77. sandbox-seccomp-filter.c | 3 +++
  78. 1 file changed, 3 insertions(+)
  79. diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
  80. index 3ef30c9d5..999c46c9f 100644
  81. --- a/sandbox-seccomp-filter.c
  82. +++ b/sandbox-seccomp-filter.c
  83. @@ -248,6 +248,9 @@ static const struct sock_filter preauth_insns[] = {
  84. #ifdef __NR_clock_nanosleep_time64
  85. SC_ALLOW(__NR_clock_nanosleep_time64),
  86. #endif
  87. +#ifdef __NR_clock_gettime64
  88. + SC_ALLOW(__NR_clock_gettime64),
  89. +#endif
  90. #ifdef __NR__newselect
  91. SC_ALLOW(__NR__newselect),
  92. #endif