diff options
| author |   Peter Seebach <peter.seebach@windriver.com> | 2015-11-25 16:42:17 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:31:03 +0000 |
| commit | 983a19a65a31b54a6f505181012bd311c28a0ae1 (patch) | |
| tree | 4d6da62bb3adf68907ad8fc86f5aea690af07e48 /meta/recipes-core/glibc | |
| parent | a7d081c3db776c8b0734942df6bf96f811f15bd3 (diff) | |
| download | openembedded-core-contrib-983a19a65a31b54a6f505181012bd311c28a0ae1.tar.gz | |
glibc/0029-fix-getmnt-empty-lines.patch: fix getmntent()
When confronted with an empty line, getmntent() can underrun
a buffer, possibly doing very strange things if it finds
additional space/tab characters. Backport the upstream fix.
Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/glibc')
| -rw-r--r-- | meta/recipes-core/glibc/glibc/0029-fix-getmntent-empty-lines.patch | 40 | ||||
| -rw-r--r-- | meta/recipes-core/glibc/glibc_2.22.bb | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc/0029-fix-getmntent-empty-lines.patch b/meta/recipes-core/glibc/glibc/0029-fix-getmntent-empty-lines.patch new file mode 100644 index 0000000000..390bb3034d --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0029-fix-getmntent-empty-lines.patch @@ -0,0 +1,40 @@ +From b0e805fa0d6fea33745952df7b7f5442ca4c374f Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Fri, 28 Aug 2015 17:08:49 -0400 +Subject: [PATCH] getmntent: fix memory corruption w/blank lines [BZ #18887] + +The fix for BZ #17273 introduced a single byte of memory corruption when +the line is entirely blank. It would walk back past the start of the +buffer if the heap happened to be 0x20 or 0x09 and then write a NUL byte. + buffer = '\n'; + end_ptr = buffer; + while (end_ptr[-1] == ' ' || end_ptr[-1] == '\t') + end_ptr--; + *end_ptr = '\0'; + +Fix that and rework the tests. Adding the testcase for BZ #17273 to the +existing \040 parser does not really make sense as it's unrelated, and +leads to confusing behavior: it implicitly relies on the new entry being +longer than the previous entry (since it just rewinds the FILE*). Split +it out into its own dedicated testcase instead. + +The original patch is at link https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=patch;h=b0e805fa0d6fea33745952df7b7f5442ca4c374f. +Only code to mntent_r.c is kept in this patch, Change log, NEWS, Makefile, and test cases are excluded. + +Upstream-Status: Backport (upstreamed to 2.23) +Signed-off-by: Baoshan Pang <baoshan.pang@windriver.com> + +diff --git a/misc/mntent_r.c b/misc/mntent_r.c +index 6159873..19af8a8 100644 +--- a/misc/mntent_r.c ++++ b/misc/mntent_r.c +@@ -136,7 +136,8 @@ __getmntent_r (FILE *stream, struct mntent *mp, char *buffer, int bufsiz) + end_ptr = strchr (buffer, '\n'); + if (end_ptr != NULL) /* chop newline */ + { +- while (end_ptr[-1] == ' ' || end_ptr[-1] == '\t') ++ while (end_ptr != buffer ++ && (end_ptr[-1] == ' ' || end_ptr[-1] == '\t')) + end_ptr--; + *end_ptr = '\0'; + } diff --git a/meta/recipes-core/glibc/glibc_2.22.bb b/meta/recipes-core/glibc/glibc_2.22.bb index da755865ad..cbacfd4748 100644 --- a/meta/recipes-core/glibc/glibc_2.22.bb +++ b/meta/recipes-core/glibc/glibc_2.22.bb @@ -41,6 +41,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://nscd-no-bash.patch \ file://0028-Clear-ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA-for-prel.patch \ file://strcoll-Remove-incorrect-STRDIFF-based-optimization-.patch \ + file://0029-fix-getmntent-empty-lines.patch \ " SRC_URI += "\ |