deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

argp-standalone: restrict value range passed to isprint function

Browse source 
According to C standards isprint argument shall be representable as an
unsigned char or be equal to EOF, otherwise the behaviour is undefined.

Passing arbitrary ints leads to segfault in nm program from elfutils.

Restrict isprint argument range to values representable by unsigned char.

Note: a similar change was done to the internal argp implementation of
glibc in commit
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=9055724a92433ffa4c36f93d918ee1b3dfa1d6f7.

[Thomas: add a reference to the corresponding glibc fix.]

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Max Filippov 2015-04-28 11:50:36 +03:00 committed by Thomas Petazzoni
parent 90d63bdefd
commit 30a3b08c17
1 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
package/argp-standalone/0002-isprint.patch Normal file
View file

@ -0,0 +1,35 @@
Subject: restrict value range passed to isprint function
According to C standards isprint argument shall be representable as an
unsigned char or be equal to EOF, otherwise the behaviour is undefined.
Passing arbitrary ints leads to segfault in nm program from elfutils.
Restrict isprint argument range to values representable by unsigned char.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
diff -bu argp-standalone-1.3/argp.h argp-standalone-1.3-/argp.h
--- argp-standalone-1.3/argp.h 2015-04-28 10:31:39.015319337 +0300
+++ argp-standalone-1.3-/argp.h 2015-04-28 10:27:46.526770624 +0300
@@ -577,7 +577,7 @@
else
{
int __key = __opt->key;
- return __key > 0 && isprint (__key);
+ return __key > 0 && __key <= UCHAR_MAX && isprint (__key);
}
}
diff -bu argp-standalone-1.3/argp-parse.c argp-standalone-1.3-/argp-parse.c
--- argp-standalone-1.3/argp-parse.c 2015-04-28 10:31:39.016319380 +0300
+++ argp-standalone-1.3-/argp-parse.c 2015-04-28 10:27:21.810818130 +0300
@@ -1292,7 +1292,7 @@
int __key = __opt->key;
/* FIXME: whether or not a particular key implies a short option
* ought not to be locale dependent. */
- return __key > 0 && isprint (__key);
+ return __key > 0 && __key <= UCHAR_MAX && isprint (__key);
}
}