adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-26 18:56:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

pm_qos: clean up racy global "name" variable

Browse source 
"name" is a poor name for a file-global variable.  It was used in three
different functions, with no mutual exclusion.  But it's just a tiny,
temporary string; let's just move it onto the stack in the functions that
need it.  Also use snprintf() just in case.

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
LKML-Reference: <20091010153349.113570550@linutronix.de>
Acked-by: Mark Gross <mgross@linux.intel.com>
Reviewed-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Jonathan Corbet 2009-08-06 13:35:44 -06:00 committed by Thomas Gleixner
parent e6fe07a014
commit 1a6deaea35
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kernel/pm_qos_params.c
View file

@ -343,18 +343,18 @@ int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier)
} }
EXPORT_SYMBOL_GPL(pm_qos_remove_notifier); EXPORT_SYMBOL_GPL(pm_qos_remove_notifier);
#define PID_NAME_LEN sizeof("process_1234567890") #define PID_NAME_LEN 32
static char name[PID_NAME_LEN];
static int pm_qos_power_open(struct inode *inode, struct file *filp) static int pm_qos_power_open(struct inode *inode, struct file *filp)
{ {
int ret; int ret;
long pm_qos_class; long pm_qos_class;
char name[PID_NAME_LEN];
pm_qos_class = find_pm_qos_object_by_minor(iminor(inode)); pm_qos_class = find_pm_qos_object_by_minor(iminor(inode));
if (pm_qos_class >= 0) { if (pm_qos_class >= 0) {
filp->private_data = (void *)pm_qos_class; filp->private_data = (void *)pm_qos_class;
sprintf(name, "process_%d", current->pid); snprintf(name, PID_NAME_LEN, "process_%d", current->pid);
ret = pm_qos_add_requirement(pm_qos_class, name, ret = pm_qos_add_requirement(pm_qos_class, name,
PM_QOS_DEFAULT_VALUE); PM_QOS_DEFAULT_VALUE);
if (ret >= 0) if (ret >= 0)
@ -366,9 +366,10 @@ static int pm_qos_power_open(struct inode *inode, struct file *filp)
static int pm_qos_power_release(struct inode *inode, struct file *filp) static int pm_qos_power_release(struct inode *inode, struct file *filp)
{ {
int pm_qos_class; int pm_qos_class;
char name[PID_NAME_LEN];
pm_qos_class = (long)filp->private_data; pm_qos_class = (long)filp->private_data;
sprintf(name, "process_%d", current->pid); snprintf(name, PID_NAME_LEN, "process_%d", current->pid);
pm_qos_remove_requirement(pm_qos_class, name); pm_qos_remove_requirement(pm_qos_class, name);
return 0; return 0;
@ -379,13 +380,14 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
{ {
s32 value; s32 value;
int pm_qos_class; int pm_qos_class;
char name[PID_NAME_LEN];
pm_qos_class = (long)filp->private_data; pm_qos_class = (long)filp->private_data;
if (count != sizeof(s32)) if (count != sizeof(s32))
return -EINVAL; return -EINVAL;
if (copy_from_user(&value, buf, sizeof(s32))) if (copy_from_user(&value, buf, sizeof(s32)))
return -EFAULT; return -EFAULT;
sprintf(name, "process_%d", current->pid); snprintf(name, PID_NAME_LEN, "process_%d", current->pid);
pm_qos_update_requirement(pm_qos_class, name, value); pm_qos_update_requirement(pm_qos_class, name, value);
return sizeof(s32); return sizeof(s32);