diff options
author | Eric Andersen <andersen@codepoet.org> | 2004-08-27 02:18:59 +0400 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2004-08-27 02:18:59 +0400 |
commit | 52499cb9ae01a67187c65ea43a48140b147968cf (patch) | |
tree | cf0f347d2c4a0cd48c6d5b4cc83aead35726434e /libbb | |
parent | 6fea7328ee525724309dcad46f34718fc654e083 (diff) |
Tito writes:
Hi,
I've spent the half night staring at the devilish my_getpwuid and my_getgrgid functions
trying to find out a way to avoid actual and future potential buffer overflow problems
without breaking existing code.
Finally I've found a not intrusive way to do this that surely doesn't break existing code
and fixes a couple of problems too.
The attached patch:
1) changes the behaviour of my_getpwuid and my_getgrgid to avoid potetntial buffer overflows
2) fixes all occurences of this function calls in tar.c , id.c , ls.c, whoami.c, logger.c, libbb.h.
3) The behaviour of tar, ls and logger is unchanged.
4) The behavior of ps with somewhat longer usernames messing up output is fixed.
5) The only bigger change was the increasing of size of the buffers in id.c to avoid
false negatives (unknown user: xxxxxx) with usernames longer than 8 chars.
The value i used ( 32 chars ) was taken from the tar header ( see gname and uname).
Maybe this buffers can be reduced a bit ( to 16 or whatever ), this is up to you.
6) The increase of size of the binary is not so dramatic:
size busybox
text data bss dec hex filename
239568 2300 36816 278684 4409c busybox
size busybox_fixed
text data bss dec hex filename
239616 2300 36816 278732 440cc busybox
7) The behaviour of whoami changed:
actually it prints out an username cut down to the size of the buffer.
This could be fixed by increasing the size of the buffer as in id.c or
avoid the use of my_getpwuid and use getpwuid directly instead.
Maybe this colud be also remain unchanged......
Please apply if you think it is ok to do so.
The diff applies on today's cvs tarball (2004-08-25).
Thanks in advance,
Ciao,
Tito
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/my_getgrgid.c | 6 | ||||
-rw-r--r-- | libbb/my_getpwuid.c | 6 | ||||
-rw-r--r-- | libbb/procps.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libbb/my_getgrgid.c b/libbb/my_getgrgid.c index 907a47486..e6b877687 100644 --- a/libbb/my_getgrgid.c +++ b/libbb/my_getgrgid.c @@ -27,16 +27,16 @@ /* gets a groupname given a gid */ -char * my_getgrgid(char *group, long gid) +char * my_getgrgid(char *group, long gid, int bufsize) { struct group *mygroup; mygroup = getgrgid(gid); if (mygroup==NULL) { - sprintf(group, "%ld", gid); + snprintf(group, bufsize, "%ld", gid); return NULL; } else { - return strcpy(group, mygroup->gr_name); + return safe_strncpy(group, mygroup->gr_name, bufsize); } } diff --git a/libbb/my_getpwuid.c b/libbb/my_getpwuid.c index 21a037f75..53f6c77ee 100644 --- a/libbb/my_getpwuid.c +++ b/libbb/my_getpwuid.c @@ -28,16 +28,16 @@ /* gets a username given a uid */ -char * my_getpwuid(char *name, long uid) +char * my_getpwuid(char *name, long uid, int bufsize) { struct passwd *myuser; myuser = getpwuid(uid); if (myuser==NULL) { - sprintf(name, "%ld", (long)uid); + snprintf(name, bufsize, "%ld", (long)uid); return NULL; } else { - return strcpy(name, myuser->pw_name); + return safe_strncpy(name, myuser->pw_name, bufsize); } } diff --git a/libbb/procps.c b/libbb/procps.c index 46e982766..e405fb7ef 100644 --- a/libbb/procps.c +++ b/libbb/procps.c @@ -57,7 +57,7 @@ extern procps_status_t * procps_scan(int save_user_arg0 sprintf(status, "/proc/%d", pid); if(stat(status, &sb)) continue; - my_getpwuid(curstatus.user, sb.st_uid); + my_getpwuid(curstatus.user, sb.st_uid, sizeof(curstatus.user)); sprintf(status, "/proc/%d/stat", pid); if((fp = fopen(status, "r")) == NULL) |