packages/glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sunrpc: fix compile error

Browse Source 
(cherry picked from commit 056101988b10c7adf1ee7bd62c1e8e6003bf3943)
This commit is contained in:
liqingqing_1229 2022-01-20 19:18:03 +08:00 committed by openeuler-sync-bot
parent 3c4e1e5184
commit 4419d577d7
2 changed files with 6 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
CVE-2022-23218-Buffer-overflow-in-sunrpc-svcunix_cre.patch
View File

@ -9,24 +9,9 @@ overflow with overlong pathname arguments.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
---
sunrpc/Makefile | 2 +-
sunrpc/svc_unix.c | 11 ++++-------
sunrpc/tst-bug28768.c | 42 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 47 insertions(+), 8 deletions(-)
create mode 100644 sunrpc/tst-bug28768.c
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index 183ef3d..a79a719 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -65,7 +65,7 @@ shared-only-routines = $(routines)
endif
tests = tst-xdrmem tst-xdrmem2 test-rpcent tst-udp-error tst-udp-timeout \
- tst-udp-nonblocking tst-bug22542
+ tst-udp-nonblocking tst-bug22542 tst-bug28768
xtests := tst-getmyaddr
1 files changed, 4 insertions(+), 7 deletions(-)
create mode 100644 sunrpc/svc_unix.c
diff --git a/sunrpc/svc_unix.c b/sunrpc/svc_unix.c
index f2280b4..67177a2 100644
@ -57,54 +42,3 @@ index f2280b4..67177a2 100644
__bind (sock, (struct sockaddr *) &addr, len);
if (__getsockname (sock, (struct sockaddr *) &addr, &len) != 0
diff --git a/sunrpc/tst-bug28768.c b/sunrpc/tst-bug28768.c
new file mode 100644
index 0000000..35a4b7b
--- /dev/null
+++ b/sunrpc/tst-bug28768.c
@@ -0,0 +1,42 @@
+/* Test to verify that long path is rejected by svcunix_create (bug 28768).
+ Copyright (C) 2022 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <errno.h>
+#include <rpc/svc.h>
+#include <shlib-compat.h>
+#include <string.h>
+#include <support/check.h>
+
+/* svcunix_create does not have a default version in linkobj/libc.so. */
+compat_symbol_reference (libc, svcunix_create, svcunix_create, GLIBC_2_1);
+
+static int
+do_test (void)
+{
+ char pathname[109];
+ memset (pathname, 'x', sizeof (pathname));
+ pathname[sizeof (pathname) - 1] = '\0';
+
+ errno = 0;
+ TEST_VERIFY (svcunix_create (RPC_ANYSOCK, 4096, 4096, pathname) == NULL);
+ TEST_COMPARE (errno, EINVAL);
+
+ return 0;
+}
+
+#include <support/test-driver.c>
--
1.8.3.1

5
glibc.spec
View File

@ -59,7 +59,7 @@
##############################################################################
Name: glibc
Version: 2.28
Release: 85
Release: 86
Summary: The GNU libc libraries
License: %{all_license}
URL: http://www.gnu.org/software/glibc/
@ -1172,6 +1172,9 @@ fi
%doc hesiod/README.hesiod
%changelog
* Thu Jan 20 2021 Qingqing Li <liqingqing3@huawei.com> - 2.28-86
- sunrpc: fix compile error
* Wed Jan 19 2021 Qingqing Li <liqingqing3@huawei.com> - 2.28-85
- sunrpc: fix CVE-2022-23218 and fix CVE-2022-23219