mirror of
https://git.yoctoproject.org/poky
synced 2026-07-17 04:07:06 +00:00
bash: update 5.0 -> 5.1
[RP: Add aclocal support and patch m4 handling to adapt to OE] (From OE-Core rev: ab4406dfdbd5e21f6fff0865228ebf5da1274505) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
f236145ce4
commit
657bc00c4c
@@ -1,386 +0,0 @@
|
||||
From 951bdaad7a18cc0dc1036bba86b18b90874d39ff Mon Sep 17 00:00:00 2001
|
||||
From: Chet Ramey <chet.ramey@case.edu>
|
||||
Date: Mon, 1 Jul 2019 09:03:53 -0400
|
||||
Subject: [PATCH] commit bash-20190628 snapshot
|
||||
|
||||
An issue was discovered in disable_priv_mode in shell.c in GNU Bash through 5.0 patch 11.
|
||||
By default, if Bash is run with its effective UID not equal to its real UID,
|
||||
it will drop privileges by setting its effective UID to its real UID.
|
||||
However, it does so incorrectly. On Linux and other systems that support "saved UID" functionality,
|
||||
the saved UID is not dropped. An attacker with command execution in the shell can use "enable -f" for
|
||||
runtime loading of a new builtin, which can be a shared object that calls setuid() and therefore
|
||||
regains privileges. However, binaries running with an effective UID of 0 are unaffected.
|
||||
|
||||
Get the patch from [1] to fix the issue.
|
||||
|
||||
Upstream-Status: Inappropriate [the upstream thinks it doesn't increase the credibility of CVEs in general]
|
||||
CVE: CVE-2019-18276
|
||||
|
||||
[1] https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=951bdaa
|
||||
|
||||
Signed-off-by: De Huo <De.Huo@windriver.com>
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||
---
|
||||
MANIFEST | 2 ++
|
||||
bashline.c | 50 +-------------------------------------------------
|
||||
builtins/help.def | 2 +-
|
||||
config.h.in | 10 +++++++++-
|
||||
configure.ac | 1 +
|
||||
doc/bash.1 | 3 ++-
|
||||
doc/bashref.texi | 3 ++-
|
||||
lib/glob/glob.c | 5 ++++-
|
||||
pathexp.c | 16 ++++++++++++++--
|
||||
shell.c | 8 ++++++++
|
||||
tests/glob.tests | 2 ++
|
||||
tests/glob6.sub | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
tests/glob7.sub | 11 +++++++++++
|
||||
14 files changed, 122 insertions(+), 56 deletions(-)
|
||||
create mode 100644 tests/glob6.sub
|
||||
create mode 100644 tests/glob7.sub
|
||||
|
||||
diff --git a/MANIFEST b/MANIFEST
|
||||
index 03de221..f9ccad7 100644
|
||||
--- a/MANIFEST
|
||||
+++ b/MANIFEST
|
||||
@@ -1037,6 +1037,8 @@ tests/extglob3.tests f
|
||||
tests/extglob3.right f
|
||||
tests/extglob4.sub f
|
||||
tests/extglob5.sub f
|
||||
+tests/glob6.sub f
|
||||
+tests/glob7.sub f
|
||||
tests/func.tests f
|
||||
tests/func.right f
|
||||
tests/func1.sub f
|
||||
diff --git a/bashline.c b/bashline.c
|
||||
index 824ea9d..d86b47d 100644
|
||||
--- a/bashline.c
|
||||
+++ b/bashline.c
|
||||
@@ -3718,55 +3718,7 @@ static int
|
||||
completion_glob_pattern (string)
|
||||
char *string;
|
||||
{
|
||||
- register int c;
|
||||
- char *send;
|
||||
- int open;
|
||||
-
|
||||
- DECLARE_MBSTATE;
|
||||
-
|
||||
- open = 0;
|
||||
- send = string + strlen (string);
|
||||
-
|
||||
- while (c = *string++)
|
||||
- {
|
||||
- switch (c)
|
||||
- {
|
||||
- case '?':
|
||||
- case '*':
|
||||
- return (1);
|
||||
-
|
||||
- case '[':
|
||||
- open++;
|
||||
- continue;
|
||||
-
|
||||
- case ']':
|
||||
- if (open)
|
||||
- return (1);
|
||||
- continue;
|
||||
-
|
||||
- case '+':
|
||||
- case '@':
|
||||
- case '!':
|
||||
- if (*string == '(') /*)*/
|
||||
- return (1);
|
||||
- continue;
|
||||
-
|
||||
- case '\\':
|
||||
- if (*string++ == 0)
|
||||
- return (0);
|
||||
- }
|
||||
-
|
||||
- /* Advance one fewer byte than an entire multibyte character to
|
||||
- account for the auto-increment in the loop above. */
|
||||
-#ifdef HANDLE_MULTIBYTE
|
||||
- string--;
|
||||
- ADVANCE_CHAR_P (string, send - string);
|
||||
- string++;
|
||||
-#else
|
||||
- ADVANCE_CHAR_P (string, send - string);
|
||||
-#endif
|
||||
- }
|
||||
- return (0);
|
||||
+ return (glob_pattern_p (string) == 1);
|
||||
}
|
||||
|
||||
static char *globtext;
|
||||
diff --git a/builtins/help.def b/builtins/help.def
|
||||
index 006c4b5..92f9b38 100644
|
||||
--- a/builtins/help.def
|
||||
+++ b/builtins/help.def
|
||||
@@ -128,7 +128,7 @@ help_builtin (list)
|
||||
|
||||
/* We should consider making `help bash' do something. */
|
||||
|
||||
- if (glob_pattern_p (list->word->word))
|
||||
+ if (glob_pattern_p (list->word->word) == 1)
|
||||
{
|
||||
printf ("%s", ngettext ("Shell commands matching keyword `", "Shell commands matching keywords `", (list->next ? 2 : 1)));
|
||||
print_word_list (list, ", ");
|
||||
diff --git a/config.h.in b/config.h.in
|
||||
index 8554aec..ad4b1e8 100644
|
||||
--- a/config.h.in
|
||||
+++ b/config.h.in
|
||||
@@ -1,6 +1,6 @@
|
||||
/* config.h -- Configuration file for bash. */
|
||||
|
||||
-/* Copyright (C) 1987-2009,2011-2012 Free Software Foundation, Inc.
|
||||
+/* Copyright (C) 1987-2009,2011-2012,2013-2019 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Bash, the Bourne Again SHell.
|
||||
|
||||
@@ -807,6 +807,14 @@
|
||||
#undef HAVE_SETREGID
|
||||
#undef HAVE_DECL_SETREGID
|
||||
|
||||
+/* Define if you have the setregid function. */
|
||||
+#undef HAVE_SETRESGID
|
||||
+#undef HAVE_DECL_SETRESGID
|
||||
+
|
||||
+/* Define if you have the setresuid function. */
|
||||
+#undef HAVE_SETRESUID
|
||||
+#undef HAVE_DECL_SETRESUID
|
||||
+
|
||||
/* Define if you have the setvbuf function. */
|
||||
#undef HAVE_SETVBUF
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 52b4cdb..549adef 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -810,6 +810,7 @@ AC_CHECK_DECLS([confstr])
|
||||
AC_CHECK_DECLS([printf])
|
||||
AC_CHECK_DECLS([sbrk])
|
||||
AC_CHECK_DECLS([setregid])
|
||||
+AC_CHECK_DECLS[(setresuid, setresgid])
|
||||
AC_CHECK_DECLS([strcpy])
|
||||
AC_CHECK_DECLS([strsignal])
|
||||
|
||||
diff --git a/doc/bash.1 b/doc/bash.1
|
||||
index e6cd08d..9e58a0b 100644
|
||||
--- a/doc/bash.1
|
||||
+++ b/doc/bash.1
|
||||
@@ -4681,7 +4681,8 @@ above).
|
||||
.PD
|
||||
.SH "SIMPLE COMMAND EXPANSION"
|
||||
When a simple command is executed, the shell performs the following
|
||||
-expansions, assignments, and redirections, from left to right.
|
||||
+expansions, assignments, and redirections, from left to right, in
|
||||
+the following order.
|
||||
.IP 1.
|
||||
The words that the parser has marked as variable assignments (those
|
||||
preceding the command name) and redirections are saved for later
|
||||
diff --git a/doc/bashref.texi b/doc/bashref.texi
|
||||
index d33cd57..3065126 100644
|
||||
--- a/doc/bashref.texi
|
||||
+++ b/doc/bashref.texi
|
||||
@@ -2964,7 +2964,8 @@ is not specified. If the file does not exist, it is created.
|
||||
@cindex command expansion
|
||||
|
||||
When a simple command is executed, the shell performs the following
|
||||
-expansions, assignments, and redirections, from left to right.
|
||||
+expansions, assignments, and redirections, from left to right, in
|
||||
+the following order.
|
||||
|
||||
@enumerate
|
||||
@item
|
||||
diff --git a/lib/glob/glob.c b/lib/glob/glob.c
|
||||
index 398253b..2eaa33e 100644
|
||||
--- a/lib/glob/glob.c
|
||||
+++ b/lib/glob/glob.c
|
||||
@@ -607,6 +607,7 @@ glob_vector (pat, dir, flags)
|
||||
register unsigned int i;
|
||||
int mflags; /* Flags passed to strmatch (). */
|
||||
int pflags; /* flags passed to sh_makepath () */
|
||||
+ int hasglob; /* return value from glob_pattern_p */
|
||||
int nalloca;
|
||||
struct globval *firstmalloc, *tmplink;
|
||||
char *convfn;
|
||||
@@ -648,10 +649,12 @@ glob_vector (pat, dir, flags)
|
||||
patlen = (pat && *pat) ? strlen (pat) : 0;
|
||||
|
||||
/* If the filename pattern (PAT) does not contain any globbing characters,
|
||||
+ or contains a pattern with only backslash escapes (hasglob == 2),
|
||||
we can dispense with reading the directory, and just see if there is
|
||||
a filename `DIR/PAT'. If there is, and we can access it, just make the
|
||||
vector to return and bail immediately. */
|
||||
- if (skip == 0 && glob_pattern_p (pat) == 0)
|
||||
+ hasglob = 0;
|
||||
+ if (skip == 0 && (hasglob = glob_pattern_p (pat)) == 0 || hasglob == 2)
|
||||
{
|
||||
int dirlen;
|
||||
struct stat finfo;
|
||||
diff --git a/pathexp.c b/pathexp.c
|
||||
index c1bf2d8..e6c5392 100644
|
||||
--- a/pathexp.c
|
||||
+++ b/pathexp.c
|
||||
@@ -58,7 +58,10 @@ int extended_glob = EXTGLOB_DEFAULT;
|
||||
/* Control enabling special handling of `**' */
|
||||
int glob_star = 0;
|
||||
|
||||
-/* Return nonzero if STRING has any unquoted special globbing chars in it. */
|
||||
+/* Return nonzero if STRING has any unquoted special globbing chars in it.
|
||||
+ This is supposed to be called when pathname expansion is performed, so
|
||||
+ it implements the rules in Posix 2.13.3, specifically that an unquoted
|
||||
+ slash cannot appear in a bracket expression. */
|
||||
int
|
||||
unquoted_glob_pattern_p (string)
|
||||
register char *string;
|
||||
@@ -85,10 +88,14 @@ unquoted_glob_pattern_p (string)
|
||||
continue;
|
||||
|
||||
case ']':
|
||||
- if (open)
|
||||
+ if (open) /* XXX - if --open == 0? */
|
||||
return (1);
|
||||
continue;
|
||||
|
||||
+ case '/':
|
||||
+ if (open)
|
||||
+ open = 0;
|
||||
+
|
||||
case '+':
|
||||
case '@':
|
||||
case '!':
|
||||
@@ -106,6 +113,11 @@ unquoted_glob_pattern_p (string)
|
||||
string++;
|
||||
continue;
|
||||
}
|
||||
+ else if (open && *string == '/')
|
||||
+ {
|
||||
+ string++; /* quoted slashes in bracket expressions are ok */
|
||||
+ continue;
|
||||
+ }
|
||||
else if (*string == 0)
|
||||
return (0);
|
||||
|
||||
diff --git a/shell.c b/shell.c
|
||||
index a2b2a55..6adabc8 100644
|
||||
--- a/shell.c
|
||||
+++ b/shell.c
|
||||
@@ -1293,7 +1293,11 @@ disable_priv_mode ()
|
||||
{
|
||||
int e;
|
||||
|
||||
+#if HAVE_DECL_SETRESUID
|
||||
+ if (setresuid (current_user.uid, current_user.uid, current_user.uid) < 0)
|
||||
+#else
|
||||
if (setuid (current_user.uid) < 0)
|
||||
+#endif
|
||||
{
|
||||
e = errno;
|
||||
sys_error (_("cannot set uid to %d: effective uid %d"), current_user.uid, current_user.euid);
|
||||
@@ -1302,7 +1306,11 @@ disable_priv_mode ()
|
||||
exit (e);
|
||||
#endif
|
||||
}
|
||||
+#if HAVE_DECL_SETRESGID
|
||||
+ if (setresgid (current_user.gid, current_user.gid, current_user.gid) < 0)
|
||||
+#else
|
||||
if (setgid (current_user.gid) < 0)
|
||||
+#endif
|
||||
sys_error (_("cannot set gid to %d: effective gid %d"), current_user.gid, current_user.egid);
|
||||
|
||||
current_user.euid = current_user.uid;
|
||||
diff --git a/tests/glob.tests b/tests/glob.tests
|
||||
index 01913bb..fb012f7 100644
|
||||
--- a/tests/glob.tests
|
||||
+++ b/tests/glob.tests
|
||||
@@ -12,6 +12,8 @@ ${THIS_SH} ./glob1.sub
|
||||
${THIS_SH} ./glob2.sub
|
||||
${THIS_SH} ./glob3.sub
|
||||
${THIS_SH} ./glob4.sub
|
||||
+${THIS_SH} ./glob6.sub
|
||||
+${THIS_SH} ./glob7.sub
|
||||
|
||||
MYDIR=$PWD # save where we are
|
||||
|
||||
diff --git a/tests/glob6.sub b/tests/glob6.sub
|
||||
new file mode 100644
|
||||
index 0000000..b099811
|
||||
--- /dev/null
|
||||
+++ b/tests/glob6.sub
|
||||
@@ -0,0 +1,54 @@
|
||||
+# tests of the backslash-in-glob-patterns discussion on the austin-group ML
|
||||
+
|
||||
+: ${TMPDIR:=/var/tmp}
|
||||
+
|
||||
+ORIG=$PWD
|
||||
+GLOBDIR=$TMPDIR/bash-glob-$$
|
||||
+mkdir $GLOBDIR && cd $GLOBDIR
|
||||
+
|
||||
+# does the pattern matcher allow backslashes as escape characters and remove
|
||||
+# them as part of matching?
|
||||
+touch abcdefg
|
||||
+pat='ab\cd*'
|
||||
+printf '<%s>\n' $pat
|
||||
+pat='\.'
|
||||
+printf '<%s>\n' $pat
|
||||
+rm abcdefg
|
||||
+
|
||||
+# how about when escaping pattern characters?
|
||||
+touch '*abc.c'
|
||||
+a='\**.c'
|
||||
+printf '%s\n' $a
|
||||
+rm -f '*abc.c'
|
||||
+
|
||||
+# how about when making the distinction between readable and searchable path
|
||||
+# components?
|
||||
+mkdir -m a=x searchable
|
||||
+mkdir -m a=r readable
|
||||
+
|
||||
+p='searchable/\.'
|
||||
+printf "%s\n" $p
|
||||
+
|
||||
+p='searchable/\./.'
|
||||
+printf "%s\n" $p
|
||||
+
|
||||
+p='readable/\.'
|
||||
+printf "%s\n" $p
|
||||
+
|
||||
+p='readable/\./.'
|
||||
+printf "%s\n" $p
|
||||
+
|
||||
+printf "%s\n" 'searchable/\.'
|
||||
+printf "%s\n" 'readable/\.'
|
||||
+
|
||||
+echo */.
|
||||
+
|
||||
+p='*/\.'
|
||||
+echo $p
|
||||
+
|
||||
+echo */'.'
|
||||
+
|
||||
+rmdir searchable readable
|
||||
+
|
||||
+cd $ORIG
|
||||
+rmdir $GLOBDIR
|
||||
diff --git a/tests/glob7.sub b/tests/glob7.sub
|
||||
new file mode 100644
|
||||
index 0000000..0212b8e
|
||||
--- /dev/null
|
||||
+++ b/tests/glob7.sub
|
||||
@@ -0,0 +1,11 @@
|
||||
+# according to Posix 2.13.3, a slash in a bracket expression renders that
|
||||
+# bracket expression invalid
|
||||
+shopt -s nullglob
|
||||
+
|
||||
+echo 1: [qwe/qwe]
|
||||
+echo 2: [qwe/
|
||||
+echo 3: [qwe/]
|
||||
+
|
||||
+echo 4: [qwe\/qwe]
|
||||
+echo 5: [qwe\/
|
||||
+echo 6: [qwe\/]
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -1,19 +1,24 @@
|
||||
Add 'ptest' target to Makefile, to run tests without checking dependencies.
|
||||
From 318b762837c2ad25319caeaf0320eff613b64daf Mon Sep 17 00:00:00 2001
|
||||
From: Anders Roxell <anders.roxell@enea.com>
|
||||
Date: Wed, 19 Dec 2012 17:18:31 +0100
|
||||
Subject: [PATCH] Add 'ptest' target to Makefile, to run tests without checking
|
||||
dependencies.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Anders Roxell <anders.roxell@enea.com>
|
||||
|
||||
Rebase to 5.0
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
|
||||
---
|
||||
Makefile.in | 24 +++++++++++++++++++-----
|
||||
1 file changed, 19 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 5fcb44b..de1c255 100644
|
||||
index bc97049..937ce39 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -932,20 +932,34 @@ maybe-clean:
|
||||
@@ -943,20 +943,34 @@ maybe-clean:
|
||||
fi
|
||||
|
||||
recho$(EXEEXT): $(SUPPORT_SRC)recho.c
|
||||
@@ -51,8 +56,5 @@ index 5fcb44b..de1c255 100644
|
||||
+
|
||||
+runtest:
|
||||
@( cd $(srcdir)/tests && \
|
||||
PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )
|
||||
BUILD_DIR=$(BUILD_DIR) PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
Including m4 files directly like this confuses autotools.bbclass, remove
|
||||
the references and rely upon aclocal to collect the m4 files together
|
||||
as needed instead making it work like other autotools based projects.
|
||||
|
||||
Upstream-Status: Inappropriate [OE configuration specific]
|
||||
RP 2021/1/20
|
||||
|
||||
Index: bash-5.1/configure.ac
|
||||
===================================================================
|
||||
--- bash-5.1.orig/configure.ac
|
||||
+++ bash-5.1/configure.ac
|
||||
@@ -688,47 +688,6 @@ if test x$SIZE = x; then
|
||||
fi
|
||||
AC_SUBST(SIZE)
|
||||
|
||||
-m4_include([m4/stat-time.m4])
|
||||
-m4_include([m4/timespec.m4])
|
||||
-
|
||||
-dnl include files for gettext
|
||||
-
|
||||
-m4_include([m4/codeset.m4])
|
||||
-m4_include([m4/extern-inline.m4])
|
||||
-m4_include([m4/fcntl-o.m4])
|
||||
-m4_include([m4/gettext.m4])
|
||||
-m4_include([m4/glibc2.m4])
|
||||
-m4_include([m4/glibc21.m4])
|
||||
-m4_include([m4/host-cpu-c-abi.m4])
|
||||
-m4_include([m4/iconv.m4])
|
||||
-m4_include([m4/intdiv0.m4])
|
||||
-m4_include([m4/intl.m4])
|
||||
-m4_include([m4/intlmacosx.m4])
|
||||
-m4_include([m4/intl-thread-locale.m4])
|
||||
-m4_include([m4/intmax.m4])
|
||||
-m4_include([m4/inttypes-pri.m4])
|
||||
-m4_include([m4/inttypes.m4])
|
||||
-m4_include([m4/inttypes_h.m4])
|
||||
-m4_include([m4/lcmessage.m4])
|
||||
-m4_include([m4/lib-ld.m4])
|
||||
-m4_include([m4/lib-link.m4])
|
||||
-m4_include([m4/lib-prefix.m4])
|
||||
-m4_include([m4/lock.m4])
|
||||
-m4_include([m4/nls.m4])
|
||||
-m4_include([m4/po.m4])
|
||||
-m4_include([m4/printf-posix.m4])
|
||||
-m4_include([m4/progtest.m4])
|
||||
-m4_include([m4/pthread_rwlock_rdlock.m4])
|
||||
-m4_include([m4/size_max.m4])
|
||||
-m4_include([m4/stdint_h.m4])
|
||||
-m4_include([m4/threadlib.m4])
|
||||
-m4_include([m4/uintmax_t.m4])
|
||||
-m4_include([m4/ulonglong.m4])
|
||||
-m4_include([m4/visibility.m4])
|
||||
-m4_include([m4/wchar_t.m4])
|
||||
-m4_include([m4/wint_t.m4])
|
||||
-m4_include([m4/xsize.m4])
|
||||
-
|
||||
dnl Turn on any extensions available in the GNU C library.
|
||||
AC_DEFINE(_GNU_SOURCE, 1)
|
||||
|
||||
Reference in New Issue
Block a user