lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] proc: make PROC_NUMBUF the buffer size for holding integers as strings

Browse Source 
Currently in /proc at several different places we define buffers to hold a
process id, or a file descriptor .  In most of them we use either a hard coded
number or a different define.  Modify them all to use PROC_NUMBUF, so the code
has a chance of being maintained.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Eric W. Biederman
2006-06-26 00:25:54 -07:00
committed by Linus Torvalds
parent 9cc8cbc7f8
commit 8578cea750
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
fs/proc/base.c
View File

@@ -185,6 +185,9 @@ enum pid_directory_inos {
PROC_TID_FD_DIR = 0x8000, /* 0x8000-0xffff */ PROC_TID_FD_DIR = 0x8000, /* 0x8000-0xffff */
}; };
/* Worst case buffer size needed for holding an integer. */
#define PROC_NUMBUF 10
struct pid_entry { struct pid_entry {
int type; int type;
int len; int len;
@@ -807,12 +810,12 @@ static ssize_t oom_adjust_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct task_struct *task = proc_task(file->f_dentry->d_inode); struct task_struct *task = proc_task(file->f_dentry->d_inode);
char buffer[8]; char buffer[PROC_NUMBUF];
size_t len; size_t len;
int oom_adjust = task->oomkilladj; int oom_adjust = task->oomkilladj;
loff_t __ppos = *ppos; loff_t __ppos = *ppos;
len = sprintf(buffer, "%i\n", oom_adjust); len = snprintf(buffer, sizeof(buffer), "%i\n", oom_adjust);
if (__ppos >= len) if (__ppos >= len)
return 0; return 0;
if (count > len-__ppos) if (count > len-__ppos)
@@ -827,14 +830,14 @@ static ssize_t oom_adjust_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct task_struct *task = proc_task(file->f_dentry->d_inode); struct task_struct *task = proc_task(file->f_dentry->d_inode);
char buffer[8], *end; char buffer[PROC_NUMBUF], *end;
int oom_adjust; int oom_adjust;
if (!capable(CAP_SYS_RESOURCE)) if (!capable(CAP_SYS_RESOURCE))
return -EPERM; return -EPERM;
memset(buffer, 0, 8); memset(buffer, 0, sizeof(buffer));
if (count > 6) if (count > sizeof(buffer) - 1)
count = 6; count = sizeof(buffer) - 1;
if (copy_from_user(buffer, buf, count)) if (copy_from_user(buffer, buf, count))
return -EFAULT; return -EFAULT;
oom_adjust = simple_strtol(buffer, &end, 0); oom_adjust = simple_strtol(buffer, &end, 0);
@@ -1099,8 +1102,6 @@ static struct inode_operations proc_pid_link_inode_operations = {
.follow_link = proc_pid_follow_link .follow_link = proc_pid_follow_link
}; };
#define NUMBUF 10
static int proc_readfd(struct file * filp, void * dirent, filldir_t filldir) static int proc_readfd(struct file * filp, void * dirent, filldir_t filldir)
{ {
struct dentry *dentry = filp->f_dentry; struct dentry *dentry = filp->f_dentry;
@@ -1108,7 +1109,7 @@ static int proc_readfd(struct file * filp, void * dirent, filldir_t filldir)
struct task_struct *p = proc_task(inode); struct task_struct *p = proc_task(inode);
unsigned int fd, tid, ino; unsigned int fd, tid, ino;
int retval; int retval;
char buf[NUMBUF]; char buf[PROC_NUMBUF];
struct files_struct * files; struct files_struct * files;
struct fdtable *fdt; struct fdtable *fdt;
@@ -1144,7 +1145,7 @@ static int proc_readfd(struct file * filp, void * dirent, filldir_t filldir)
continue; continue;
rcu_read_unlock(); rcu_read_unlock();
j = NUMBUF; j = PROC_NUMBUF;
i = fd; i = fd;
do { do {
j--; j--;
@@ -1153,7 +1154,7 @@ static int proc_readfd(struct file * filp, void * dirent, filldir_t filldir)
} while (i); } while (i);
ino = fake_ino(tid, PROC_TID_FD_DIR + fd); ino = fake_ino(tid, PROC_TID_FD_DIR + fd);
if (filldir(dirent, buf+j, NUMBUF-j, fd+2, ino, DT_LNK) < 0) { if (filldir(dirent, buf+j, PROC_NUMBUF-j, fd+2, ino, DT_LNK) < 0) {
rcu_read_lock(); rcu_read_lock();
break; break;
} }
@@ -1828,14 +1829,14 @@ static struct inode_operations proc_tid_attr_inode_operations = {
static int proc_self_readlink(struct dentry *dentry, char __user *buffer, static int proc_self_readlink(struct dentry *dentry, char __user *buffer,
int buflen) int buflen)
{ {
char tmp[30]; char tmp[PROC_NUMBUF];
sprintf(tmp, "%d", current->tgid); sprintf(tmp, "%d", current->tgid);
return vfs_readlink(dentry,buffer,buflen,tmp); return vfs_readlink(dentry,buffer,buflen,tmp);
} }
static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd) static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
{ {
char tmp[30]; char tmp[PROC_NUMBUF];
sprintf(tmp, "%d", current->tgid); sprintf(tmp, "%d", current->tgid);
return ERR_PTR(vfs_follow_link(nd,tmp)); return ERR_PTR(vfs_follow_link(nd,tmp));
} }
@@ -1869,7 +1870,7 @@ static struct inode_operations proc_self_inode_operations = {
void proc_flush_task(struct task_struct *task) void proc_flush_task(struct task_struct *task)
{ {
struct dentry *dentry, *leader, *dir; struct dentry *dentry, *leader, *dir;
char buf[30]; char buf[PROC_NUMBUF];
struct qstr name; struct qstr name;
name.name = buf; name.name = buf;
@@ -2026,8 +2027,6 @@ out:
return result; return result;
} }
#define PROC_NUMBUF 10
/* /*
* Find the first tgid to return to user space. * Find the first tgid to return to user space.
* *