openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Increase buffer size, use bounds checking functions 

Increase the size of the user/group buffer from 16 bytes
to 32 bytes. Some OEMs are creating usernames longer than
15 bytes, causing problems.

Use bounds checking functions when handling user/group
data, to avoid overflowing buffers.

Change-Id: I4a5824b819b0c37662ba4f33573af0d0e071b444
This commit is contained in:
Nick Kralevich 2013-11-27 15:09:43 -08:00
parent 1899628a2e
commit 4ec2910fb6
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
toolbox/ls.c
View File

@ -75,23 +75,23 @@ static void mode2str(unsigned mode, char *out)
*out = 0;
}
static void user2str(unsigned uid, char *out)
static void user2str(uid_t uid, char *out, size_t out_size)
{
struct passwd *pw = getpwuid(uid);
if(pw) {
strcpy(out, pw->pw_name);
strlcpy(out, pw->pw_name, out_size);
} else {
sprintf(out, "%d", uid);
snprintf(out, out_size, "%d", uid);
}
}
static void group2str(unsigned gid, char *out)
static void group2str(gid_t gid, char *out, size_t out_size)
{
struct group *gr = getgrgid(gid);
if(gr) {
strcpy(out, gr->gr_name);
strlcpy(out, gr->gr_name, out_size);
} else {
sprintf(out, "%d", gid);
snprintf(out, out_size, "%d", gid);
}
}
@ -164,8 +164,8 @@ static int listfile_long(const char *path, struct stat *s, int flags)
{
char date[32];
char mode[16];
char user[16];
char group[16];
char user[32];
char group[32];
const char *name;
if(!s || !path) {
@ -182,11 +182,11 @@ static int listfile_long(const char *path, struct stat *s, int flags)
mode2str(s->st_mode, mode);
if (flags & LIST_LONG_NUMERIC) {
sprintf(user, "%ld", s->st_uid);
sprintf(group, "%ld", s->st_gid);
snprintf(user, sizeof(user), "%ld", s->st_uid);
snprintf(group, sizeof(group), "%ld", s->st_gid);
} else {
user2str(s->st_uid, user);
group2str(s->st_gid, group);
user2str(s->st_uid, user, sizeof(user));
group2str(s->st_gid, group, sizeof(group));
}
strftime(date, 32, "%Y-%m-%d %H:%M", localtime((const time_t*)&s->st_mtime));
@ -238,8 +238,8 @@ static int listfile_long(const char *path, struct stat *s, int flags)
static int listfile_maclabel(const char *path, struct stat *s, int flags)
{
char mode[16];
char user[16];
char group[16];
char user[32];
char group[32];
char *maclabel = NULL;
const char *name;
@ -261,8 +261,8 @@ static int listfile_maclabel(const char *path, struct stat *s, int flags)
}
mode2str(s->st_mode, mode);
user2str(s->st_uid, user);
group2str(s->st_gid, group);
user2str(s->st_uid, user, sizeof(user));
group2str(s->st_gid, group, sizeof(group));
switch(s->st_mode & S_IFMT) {
case S_IFLNK: {