Hi Rafael,
After merging the suspend tree, today's linux-next build (i386 defconfig
among others) produced this warning:
kernel/pm_qos_params.c: In function 'pm_qos_power_write':
kernel/pm_qos_params.c:420: warning: passing argument 3 of 'kstrtol' from incompatible pointer type
include/linux/kernel.h:210: note: expected 'long int *' but argument is of type 's32 *'
Intreoduced by commit 365daa955e03 ("PM: Correct PM QOS's user mode
interface to work with ascii input per").
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Mon, May 23, 2011 at 03:06:36PM +1000, Stephen Rothwell wrote:
> Hi Rafael,
>
> After merging the suspend tree, today's linux-next build (i386 defconfig
> among others) produced this warning:
>
> kernel/pm_qos_params.c: In function 'pm_qos_power_write':
> kernel/pm_qos_params.c:420: warning: passing argument 3 of 'kstrtol' from incompatible pointer type
> include/linux/kernel.h:210: note: expected 'long int *' but argument is of type 's32 *'
>
> Intreoduced by commit 365daa955e03 ("PM: Correct PM QOS's user mode
> interface to work with ascii input per").
Gah! I'm sorry about that.
attached is a fix.
--mark
signed-off-by:markgross <[email protected]>
>From a8f0587b9ae598be5ca4c3cdda4e0ced6ca9baaf Mon Sep 17 00:00:00 2001
From: mgross <mgross@cr48>
Date: Mon, 23 May 2011 07:14:09 -0700
Subject: [PATCH] clean up a compile time warning in the use of strict_strtol but that was
passing an s32 * when it should be passing a long *
---
kernel/pm_qos_params.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c
index d61ecf3..dd37c56 100644
--- a/kernel/pm_qos_params.c
+++ b/kernel/pm_qos_params.c
@@ -405,6 +405,7 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
size_t count, loff_t *f_pos)
{
s32 value;
+ long safe_int;
int x;
char ascii_value[11];
struct pm_qos_request_list *pm_qos_req;
@@ -417,10 +418,11 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
ascii_value[count] = 0;
if (copy_from_user(ascii_value, buf, count))
return -EFAULT;
- if ((x=strict_strtol(ascii_value, 16, &value)) != 0){
- pr_debug("%s, 0x%x, 0x%x\n",ascii_value, value, x);
+ if ((x=strict_strtol(ascii_value, 16, &safe_int)) != 0){
+ pr_debug("%s, 0x%lx, 0x%x\n",ascii_value, safe_int, x);
return -EINVAL;
}
+ value = (s32) safe_int;
} else
return -EINVAL;
--
1.7.4.1
On Mon, 23 May 2011 07:18:46 -0700 mark gross wrote:
> On Mon, May 23, 2011 at 03:06:36PM +1000, Stephen Rothwell wrote:
> > Hi Rafael,
> >
> > After merging the suspend tree, today's linux-next build (i386 defconfig
> > among others) produced this warning:
> >
> > kernel/pm_qos_params.c: In function 'pm_qos_power_write':
> > kernel/pm_qos_params.c:420: warning: passing argument 3 of 'kstrtol' from incompatible pointer type
> > include/linux/kernel.h:210: note: expected 'long int *' but argument is of type 's32 *'
> >
> > Intreoduced by commit 365daa955e03 ("PM: Correct PM QOS's user mode
> > interface to work with ascii input per").
>
> Gah! I'm sorry about that.
>
> attached is a fix.
>
>
> --mark
>
> signed-off-by:markgross <[email protected]>
Not in correct format.
>
> From a8f0587b9ae598be5ca4c3cdda4e0ced6ca9baaf Mon Sep 17 00:00:00 2001
> From: mgross <mgross@cr48>
what is cr48? conference room 48?
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
On Mon, 23 May 2011 about 14:18:46 -0000, mgross wrote:
> On Mon, May 23, 2011 at 03:06:36PM +1000, Stephen Rothwell wrote:
> > Hi Rafael,
> >
> > After merging the suspend tree, today's linux-next build (i386 defconfig
> > among others) produced this warning:
> >
> > kernel/pm_qos_params.c: In function 'pm_qos_power_write':
> > kernel/pm_qos_params.c:420: warning: passing argument 3 of 'kstrtol' from incompatible pointer type
> > include/linux/kernel.h:210: note: expected 'long int *' but argument is of type 's32 *'
> >
> > Intreoduced by commit 365daa955e03 ("PM: Correct PM QOS's user mode
> > interface to work with ascii input per").
>
> Gah! I'm sorry about that.
>
> attached is a fix.
>
>
> --mark
>
> signed-off-by:markgross <[email protected]>
>
(1) This should be in the patch, not the enclosing letter
(2) Incorrect capitalization
(3) Incorrect spacing
Please read Documentation/SubmittingPatches again.
>
>
> >From a8f0587b9ae598be5ca4c3cdda4e0ced6ca9baaf Mon Sep 17 00:00:00 2001
> From: mgross <mgross@cr48>
> Date: Mon, 23 May 2011 07:14:09 -0700
> Subject: [PATCH] clean up a compile time warning in the use of strict_strtol but that was
> passing an s32 * when it should be passing a long *
>
>From should match Signed-off-by:
Please seperate title (subject) and description body
Maybe: pm_qos: strict_strtol takes a long, not s32
strict_strtol takes a pointer to long to store the converted value.
introduced in xxxx ("change set title here")
So that the reviewers can quickly see if it needs to be backported
to stable etc.
except read below
> ---
> kernel/pm_qos_params.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c
> index d61ecf3..dd37c56 100644
> --- a/kernel/pm_qos_params.c
> +++ b/kernel/pm_qos_params.c
> @@ -405,6 +405,7 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> size_t count, loff_t *f_pos)
> {
> s32 value;
> + long safe_int;
> int x;
> char ascii_value[11];
> struct pm_qos_request_list *pm_qos_req;
> @@ -417,10 +418,11 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> ascii_value[count] = 0;
> if (copy_from_user(ascii_value, buf, count))
> return -EFAULT;
> - if ((x=strict_strtol(ascii_value, 16, &value)) != 0){
> - pr_debug("%s, 0x%x, 0x%x\n",ascii_value, value, x);
> + if ((x=strict_strtol(ascii_value, 16, &safe_int)) != 0){
Why are you doing an assignment in the if? Why not assign first and
compare later?
> + pr_debug("%s, 0x%lx, 0x%x\n",ascii_value, safe_int, x);
> return -EINVAL;
Nit: Some reason not to return -ERANGE if thats what strtol returned?
Folding to -EINVAL is ok but hides information.
> }
> + value = (s32) safe_int;
You call strict checking, which includes overflow checking, but
only that the value fits in a long. You then defeat that checking
by casting to int.
It looks like you want strict_strtoint except thats not defined.
Hoever, the pattern for strict_strto* is kstrto* and kstrtos32 is
defined ...
> } else
> return -EINVAL;
>
Oh, and you now may copy 11 characters from userspace into an 11
character buffer then terminate it by writing the 12th character
(ascii_value[count == 11]). Except its an 11 character array.
What is the magic to set the value to a negative number? Is
yet another character for the - required?
I see the string from userspace wasn't properly terminated before
either. In ed77134bfccf5e75b (PM QOS update), merged in v2.6.35-rc1,
11 bytes were copied from user then passed to ssscanf without null
termination forced. It was updated in 0109c2c48d (PM QoS: Correct
pr_debug() misuse and improve parameter checks), which was merged in
2.6.36-rc4, to change the the function that walks off the string from
sscanf to strlen. That changelog isn't marked for stable (I didn't
look if it was sent) but it still isn't force terminated.
happy patching,
milton
[ I managed to botch my own email the first time, how embarrassing!
So I added Randy and updated the paragraph about negative values.
And then I need a new Message-Id too. ]
On Mon, 23 May 2011 about 14:18:46 -0000, mgross wrote:
> On Mon, May 23, 2011 at 03:06:36PM +1000, Stephen Rothwell wrote:
> > Hi Rafael,
> >
> > After merging the suspend tree, today's linux-next build (i386 defconfig
> > among others) produced this warning:
> >
> > kernel/pm_qos_params.c: In function 'pm_qos_power_write':
> > kernel/pm_qos_params.c:420: warning: passing argument 3 of 'kstrtol' from incompatible pointer type
> > include/linux/kernel.h:210: note: expected 'long int *' but argument is of type 's32 *'
> >
> > Intreoduced by commit 365daa955e03 ("PM: Correct PM QOS's user mode
> > interface to work with ascii input per").
>
> Gah! I'm sorry about that.
>
> attached is a fix.
>
>
> --mark
>
> signed-off-by:markgross <[email protected]>
>
(1) This should be in the patch, not the enclosing letter
(2) Incorrect capitalization
(3) Incorrect spacing
Please read Documentation/SubmittingPatches again.
>
>
> >From a8f0587b9ae598be5ca4c3cdda4e0ced6ca9baaf Mon Sep 17 00:00:00 2001
> From: mgross <mgross@cr48>
> Date: Mon, 23 May 2011 07:14:09 -0700
> Subject: [PATCH] clean up a compile time warning in the use of strict_strtol but that was
> passing an s32 * when it should be passing a long *
>
>From should match Signed-off-by:
Please seperate title (subject) and description body
Maybe: pm_qos: strict_strtol takes a long, not s32
strict_strtol takes a pointer to long to store the converted value.
introduced in xxxx ("change set title here")
So that the reviewers can quickly see if it needs to be backported
to stable etc.
except read below
> ---
> kernel/pm_qos_params.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c
> index d61ecf3..dd37c56 100644
> --- a/kernel/pm_qos_params.c
> +++ b/kernel/pm_qos_params.c
> @@ -405,6 +405,7 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> size_t count, loff_t *f_pos)
> {
> s32 value;
> + long safe_int;
> int x;
> char ascii_value[11];
> struct pm_qos_request_list *pm_qos_req;
> @@ -417,10 +418,11 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> ascii_value[count] = 0;
> if (copy_from_user(ascii_value, buf, count))
> return -EFAULT;
> - if ((x=strict_strtol(ascii_value, 16, &value)) != 0){
> - pr_debug("%s, 0x%x, 0x%x\n",ascii_value, value, x);
> + if ((x=strict_strtol(ascii_value, 16, &safe_int)) != 0){
Why are you doing an assignment in the if? Why not assign first and
compare later?
> + pr_debug("%s, 0x%lx, 0x%x\n",ascii_value, safe_int, x);
> return -EINVAL;
Nit: Some reason not to return -ERANGE if thats what strtol returned?
While folding the error to -EINVAL is ok, it hides diagnostic informatio
from the user.
> }
> + value = (s32) safe_int;
You call strict checking, which includes overflow checking, but
only that the value fits in a long. You then defeat that checking
by casting to int.
It looks like you want strict_strtoint except thats not defined.
Hoever, the pattern for strict_strto* is kstrto* and kstrtos32 is
defined ...
> } else
> return -EINVAL;
>
Oh, and you now may copy 11 characters from userspace into an 11
character buffer then terminate it by writing the 12th character
(ascii_value[count == 11]). Except its an 11 character array.
The variable is a s32, aparently in native endian if pased in binary
as 4 bytes. What is the magic to set the value to a negative number
through the ascii interface? Is yet another character for the -
required?
I see the string from userspace wasn't properly terminated before
either. In ed77134bfccf5e75b (PM QOS update), merged in v2.6.35-rc1,
11 bytes were copied from user then passed to ssscanf without null
termination forced. It was updated in 0109c2c48d (PM QoS: Correct
pr_debug() misuse and improve parameter checks), which was merged in
2.6.36-rc4, to change the the function that walks off the string from
sscanf to strlen. That changelog isn't marked for stable (I didn't
look if it was sent) but it still isn't force terminated.
happy patching,
milton
On Monday, May 23, 2011, Milton Miller wrote:
> On Mon, 23 May 2011 about 14:18:46 -0000, mgross wrote:
> > On Mon, May 23, 2011 at 03:06:36PM +1000, Stephen Rothwell wrote:
> > > Hi Rafael,
> > >
> > > After merging the suspend tree, today's linux-next build (i386 defconfig
> > > among others) produced this warning:
> > >
> > > kernel/pm_qos_params.c: In function 'pm_qos_power_write':
> > > kernel/pm_qos_params.c:420: warning: passing argument 3 of 'kstrtol' from incompatible pointer type
> > > include/linux/kernel.h:210: note: expected 'long int *' but argument is of type 's32 *'
> > >
> > > Intreoduced by commit 365daa955e03 ("PM: Correct PM QOS's user mode
> > > interface to work with ascii input per").
> >
> > Gah! I'm sorry about that.
> >
> > attached is a fix.
> >
> >
> > --mark
> >
> > signed-off-by:markgross <[email protected]>
> >
>
> (1) This should be in the patch, not the enclosing letter
That message is for me, actually. I can fold the fix into the patch.
> (2) Incorrect capitalization
Doesn't matter, I can fix it up.
> (3) Incorrect spacing
Likewise.
> Please read Documentation/SubmittingPatches again.
>
> >
> >
> > >From a8f0587b9ae598be5ca4c3cdda4e0ced6ca9baaf Mon Sep 17 00:00:00 2001
> > From: mgross <mgross@cr48>
> > Date: Mon, 23 May 2011 07:14:09 -0700
> > Subject: [PATCH] clean up a compile time warning in the use of strict_strtol but that was
> > passing an s32 * when it should be passing a long *
> >
>
> From should match Signed-off-by:
Not necessarily.
> Please seperate title (subject) and description body
Doesn't matter here.
> Maybe: pm_qos: strict_strtol takes a long, not s32
>
> strict_strtol takes a pointer to long to store the converted value.
> introduced in xxxx ("change set title here")
>
> So that the reviewers can quickly see if it needs to be backported
> to stable etc.
>
> except read below
>
>
> > ---
> > kernel/pm_qos_params.c | 6 ++++--
> > 1 files changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c
> > index d61ecf3..dd37c56 100644
> > --- a/kernel/pm_qos_params.c
> > +++ b/kernel/pm_qos_params.c
> > @@ -405,6 +405,7 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> > size_t count, loff_t *f_pos)
> > {
> > s32 value;
> > + long safe_int;
> > int x;
> > char ascii_value[11];
> > struct pm_qos_request_list *pm_qos_req;
> > @@ -417,10 +418,11 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> > ascii_value[count] = 0;
> > if (copy_from_user(ascii_value, buf, count))
> > return -EFAULT;
> > - if ((x=strict_strtol(ascii_value, 16, &value)) != 0){
> > - pr_debug("%s, 0x%x, 0x%x\n",ascii_value, value, x);
> > + if ((x=strict_strtol(ascii_value, 16, &safe_int)) != 0){
>
> Why are you doing an assignment in the if? Why not assign first and
> compare later?
Because that's what the original code does?
> > + pr_debug("%s, 0x%lx, 0x%x\n",ascii_value, safe_int, x);
> > return -EINVAL;
>
> Nit: Some reason not to return -ERANGE if thats what strtol returned?
> Folding to -EINVAL is ok but hides information.
>
> > }
> > + value = (s32) safe_int;
>
> You call strict checking, which includes overflow checking, but
> only that the value fits in a long. You then defeat that checking
> by casting to int.
That actually is a good point.
Thanks,
Rafael
On Monday, May 23, 2011, mark gross wrote:
> On Mon, May 23, 2011 at 03:06:36PM +1000, Stephen Rothwell wrote:
> > Hi Rafael,
> >
> > After merging the suspend tree, today's linux-next build (i386 defconfig
> > among others) produced this warning:
> >
> > kernel/pm_qos_params.c: In function 'pm_qos_power_write':
> > kernel/pm_qos_params.c:420: warning: passing argument 3 of 'kstrtol' from incompatible pointer type
> > include/linux/kernel.h:210: note: expected 'long int *' but argument is of type 's32 *'
> >
> > Intreoduced by commit 365daa955e03 ("PM: Correct PM QOS's user mode
> > interface to work with ascii input per").
>
> Gah! I'm sorry about that.
>
> attached is a fix.
>
>
> --mark
>
> signed-off-by:markgross <[email protected]>
>
>
>
> From a8f0587b9ae598be5ca4c3cdda4e0ced6ca9baaf Mon Sep 17 00:00:00 2001
> From: mgross <mgross@cr48>
> Date: Mon, 23 May 2011 07:14:09 -0700
> Subject: [PATCH] clean up a compile time warning in the use of strict_strtol but that was
> passing an s32 * when it should be passing a long *
>
> ---
> kernel/pm_qos_params.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c
> index d61ecf3..dd37c56 100644
> --- a/kernel/pm_qos_params.c
> +++ b/kernel/pm_qos_params.c
> @@ -405,6 +405,7 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> size_t count, loff_t *f_pos)
> {
> s32 value;
> + long safe_int;
> int x;
> char ascii_value[11];
> struct pm_qos_request_list *pm_qos_req;
> @@ -417,10 +418,11 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> ascii_value[count] = 0;
> if (copy_from_user(ascii_value, buf, count))
> return -EFAULT;
> - if ((x=strict_strtol(ascii_value, 16, &value)) != 0){
> - pr_debug("%s, 0x%x, 0x%x\n",ascii_value, value, x);
> + if ((x=strict_strtol(ascii_value, 16, &safe_int)) != 0){
> + pr_debug("%s, 0x%lx, 0x%x\n",ascii_value, safe_int, x);
> return -EINVAL;
> }
> + value = (s32) safe_int;
Well, this doesn't seem quite right.
> } else
> return -EINVAL;
Besides, if count == 11, there we'll write beyond ascii_value[], right?
What about the appended patch instead of your original one?
Rafael
---
From: mark gross <[email protected]>
Subject: PM: Correct PM QOS's user mode interface to work with ascii input per
What is in the kernel docs. Writing a string to the ABI from user mode
comes in 2 flavors. One with and one without a '\n' at the end. This
change accepts both.
# echo 0x12345678 > /dev/cpu_dma_latency
and
# echo -n 0x12345678 > /dev/cpu_dma_latency
now both work.
[rjw: Fixed up array bounds checking and type casting.]
Signed-off-by: mark gross <[email protected]>
Acked-by: Simon Horman <[email protected]>
Signed-off-by: Rafael J. Wysocki <[email protected]>
---
kernel/pm_qos_params.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
Index: linux-2.6/kernel/pm_qos_params.c
===================================================================
--- linux-2.6.orig/kernel/pm_qos_params.c
+++ linux-2.6/kernel/pm_qos_params.c
@@ -40,6 +40,7 @@
#include <linux/string.h>
#include <linux/platform_device.h>
#include <linux/init.h>
+#include <linux/kernel.h>
#include <linux/uaccess.h>
@@ -404,24 +405,30 @@ static ssize_t pm_qos_power_write(struct
size_t count, loff_t *f_pos)
{
s32 value;
- int x;
char ascii_value[11];
struct pm_qos_request_list *pm_qos_req;
if (count == sizeof(s32)) {
if (copy_from_user(&value, buf, sizeof(s32)))
return -EFAULT;
- } else if (count == 11) { /* len('0x12345678/0') */
- if (copy_from_user(ascii_value, buf, 11))
+ } else if (count >= 10) { /* '0x12345678' or '0x12345678\n'*/
+ unsigned long int ulval;
+ int ret;
+
+ count = 10;
+ ascii_value[count] = 0;
+ if (copy_from_user(ascii_value, buf, count))
return -EFAULT;
- if (strlen(ascii_value) != 10)
- return -EINVAL;
- x = sscanf(ascii_value, "%x", &value);
- if (x != 1)
+
+ ret = strict_strtoul(ascii_value, 16, &ulval);
+ if (ret){
+ pr_debug("%s, 0x%lx, 0x%x\n", ascii_value, ulval, ret);
return -EINVAL;
- pr_debug("%s, %d, 0x%x\n", ascii_value, x, value);
- } else
+ }
+ value = (s32)lower_32_bits(ulval);
+ } else {
return -EINVAL;
+ }
pm_qos_req = filp->private_data;
pm_qos_update_request(pm_qos_req, value);
On Mon, May 23, 2011 at 12:42:18PM -0500, Milton Miller wrote:
> [ I managed to botch my own email the first time, how embarrassing!
> So I added Randy and updated the paragraph about negative values.
> And then I need a new Message-Id too. ]
I any more resends from you and I'll have to diff your emails to see
what new comments you have come up with.
FWIW Normally when I submit a patch for quick review this is what
happens. I should be more careful. Please note that I didn't start my
subject line with a [patch].
>
> On Mon, 23 May 2011 about 14:18:46 -0000, mgross wrote:
> > On Mon, May 23, 2011 at 03:06:36PM +1000, Stephen Rothwell wrote:
> > > Hi Rafael,
> > >
> > > After merging the suspend tree, today's linux-next build (i386 defconfig
> > > among others) produced this warning:
> > >
> > > kernel/pm_qos_params.c: In function 'pm_qos_power_write':
> > > kernel/pm_qos_params.c:420: warning: passing argument 3 of 'kstrtol' from incompatible pointer type
> > > include/linux/kernel.h:210: note: expected 'long int *' but argument is of type 's32 *'
> > >
> > > Intreoduced by commit 365daa955e03 ("PM: Correct PM QOS's user mode
> > > interface to work with ascii input per").
> >
> > Gah! I'm sorry about that.
> >
> > attached is a fix.
> >
> >
> > --mark
> >
> > signed-off-by:markgross <[email protected]>
> >
>
> (1) This should be in the patch, not the enclosing letter
> (2) Incorrect capitalization
> (3) Incorrect spacing
>
> Please read Documentation/SubmittingPatches again.
Yes I will do that.
>
> >
> >
> > >From a8f0587b9ae598be5ca4c3cdda4e0ced6ca9baaf Mon Sep 17 00:00:00 2001
> > From: mgross <mgross@cr48>
> > Date: Mon, 23 May 2011 07:14:09 -0700
> > Subject: [PATCH] clean up a compile time warning in the use of strict_strtol but that was
> > passing an s32 * when it should be passing a long *
> >
>
> From should match Signed-off-by:
>
> Please seperate title (subject) and description body
>
> Maybe: pm_qos: strict_strtol takes a long, not s32
>
> strict_strtol takes a pointer to long to store the converted value.
> introduced in xxxx ("change set title here")
>
> So that the reviewers can quickly see if it needs to be backported
> to stable etc.
>
> except read below
>
>
> > ---
> > kernel/pm_qos_params.c | 6 ++++--
> > 1 files changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c
> > index d61ecf3..dd37c56 100644
> > --- a/kernel/pm_qos_params.c
> > +++ b/kernel/pm_qos_params.c
> > @@ -405,6 +405,7 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> > size_t count, loff_t *f_pos)
> > {
> > s32 value;
> > + long safe_int;
> > int x;
> > char ascii_value[11];
> > struct pm_qos_request_list *pm_qos_req;
> > @@ -417,10 +418,11 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> > ascii_value[count] = 0;
> > if (copy_from_user(ascii_value, buf, count))
> > return -EFAULT;
> > - if ((x=strict_strtol(ascii_value, 16, &value)) != 0){
> > - pr_debug("%s, 0x%x, 0x%x\n",ascii_value, value, x);
> > + if ((x=strict_strtol(ascii_value, 16, &safe_int)) != 0){
>
> Why are you doing an assignment in the if? Why not assign first and
> compare later?
>
> > + pr_debug("%s, 0x%lx, 0x%x\n",ascii_value, safe_int, x);
> > return -EINVAL;
>
> Nit: Some reason not to return -ERANGE if thats what strtol returned?
> While folding the error to -EINVAL is ok, it hides diagnostic informatio
> from the user.
I think EINVAL matches the documentation for this ABI better that
ERANGE.
>
> > }
> > + value = (s32) safe_int;
>
> You call strict checking, which includes overflow checking, but
> only that the value fits in a long. You then defeat that checking
> by casting to int.
The documentation for the ABI says that it has to be a hex value of the
formation 0x12345678 otherwise its not valid. s32 is big enough for
that. I thought about masking for a second and decided this is good
enough.
> It looks like you want strict_strtoint except thats not defined.
> Hoever, the pattern for strict_strto* is kstrto* and kstrtos32 is
> defined ...
hmm, I'll look at the strtos32. That is what I would like.
>
> > } else
> > return -EINVAL;
> >
>
> Oh, and you now may copy 11 characters from userspace into an 11
> character buffer then terminate it by writing the 12th character
> (ascii_value[count == 11]). Except its an 11 character array.
yes, if count = 11 then this code is overwriting by one byte :( I must
have gotten luckly because 11 is an odd number and the compiler padded
it from me. I'll fix that in a future patch.
> The variable is a s32, aparently in native endian if pased in binary
> as 4 bytes. What is the magic to set the value to a negative number
> through the ascii interface? Is yet another character for the -
> required?
No. The ABI documentation is pretty clear about the text format being
simple hex 0x12345678 styled.
--mark
>
>
> I see the string from userspace wasn't properly terminated before
> either. In ed77134bfccf5e75b (PM QOS update), merged in v2.6.35-rc1,
> 11 bytes were copied from user then passed to ssscanf without null
> termination forced. It was updated in 0109c2c48d (PM QoS: Correct
> pr_debug() misuse and improve parameter checks), which was merged in
> 2.6.36-rc4, to change the the function that walks off the string from
> sscanf to strlen. That changelog isn't marked for stable (I didn't
> look if it was sent) but it still isn't force terminated.
>
> happy patching,
> milton
On Mon, May 23, 2011 at 09:54:52PM +0200, Rafael J. Wysocki wrote:
> On Monday, May 23, 2011, mark gross wrote:
> > On Mon, May 23, 2011 at 03:06:36PM +1000, Stephen Rothwell wrote:
> > > Hi Rafael,
> > >
> > > After merging the suspend tree, today's linux-next build (i386 defconfig
> > > among others) produced this warning:
> > >
> > > kernel/pm_qos_params.c: In function 'pm_qos_power_write':
> > > kernel/pm_qos_params.c:420: warning: passing argument 3 of 'kstrtol' from incompatible pointer type
> > > include/linux/kernel.h:210: note: expected 'long int *' but argument is of type 's32 *'
> > >
> > > Intreoduced by commit 365daa955e03 ("PM: Correct PM QOS's user mode
> > > interface to work with ascii input per").
> >
> > Gah! I'm sorry about that.
> >
> > attached is a fix.
> >
> >
> > --mark
> >
> > signed-off-by:markgross <[email protected]>
> >
> >
> >
> > From a8f0587b9ae598be5ca4c3cdda4e0ced6ca9baaf Mon Sep 17 00:00:00 2001
> > From: mgross <mgross@cr48>
> > Date: Mon, 23 May 2011 07:14:09 -0700
> > Subject: [PATCH] clean up a compile time warning in the use of strict_strtol but that was
> > passing an s32 * when it should be passing a long *
> >
> > ---
> > kernel/pm_qos_params.c | 6 ++++--
> > 1 files changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c
> > index d61ecf3..dd37c56 100644
> > --- a/kernel/pm_qos_params.c
> > +++ b/kernel/pm_qos_params.c
> > @@ -405,6 +405,7 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> > size_t count, loff_t *f_pos)
> > {
> > s32 value;
> > + long safe_int;
> > int x;
> > char ascii_value[11];
> > struct pm_qos_request_list *pm_qos_req;
> > @@ -417,10 +418,11 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> > ascii_value[count] = 0;
> > if (copy_from_user(ascii_value, buf, count))
> > return -EFAULT;
> > - if ((x=strict_strtol(ascii_value, 16, &value)) != 0){
> > - pr_debug("%s, 0x%x, 0x%x\n",ascii_value, value, x);
> > + if ((x=strict_strtol(ascii_value, 16, &safe_int)) != 0){
> > + pr_debug("%s, 0x%lx, 0x%x\n",ascii_value, safe_int, x);
> > return -EINVAL;
> > }
> > + value = (s32) safe_int;
>
> Well, this doesn't seem quite right.
>
> > } else
> > return -EINVAL;
>
> Besides, if count == 11, there we'll write beyond ascii_value[], right?
right. That is a bug.
>
> What about the appended patch instead of your original one?
Thank you!
> Rafael
>
>
> ---
> From: mark gross <[email protected]>
> Subject: PM: Correct PM QOS's user mode interface to work with ascii input per
>
> What is in the kernel docs. Writing a string to the ABI from user mode
> comes in 2 flavors. One with and one without a '\n' at the end. This
> change accepts both.
>
> # echo 0x12345678 > /dev/cpu_dma_latency
>
> and
>
> # echo -n 0x12345678 > /dev/cpu_dma_latency
>
> now both work.
>
> [rjw: Fixed up array bounds checking and type casting.]
>
> Signed-off-by: mark gross <[email protected]>
> Acked-by: Simon Horman <[email protected]>
> Signed-off-by: Rafael J. Wysocki <[email protected]>
> ---
> kernel/pm_qos_params.c | 25 ++++++++++++++++---------
> 1 file changed, 16 insertions(+), 9 deletions(-)
>
> Index: linux-2.6/kernel/pm_qos_params.c
> ===================================================================
> --- linux-2.6.orig/kernel/pm_qos_params.c
> +++ linux-2.6/kernel/pm_qos_params.c
> @@ -40,6 +40,7 @@
> #include <linux/string.h>
> #include <linux/platform_device.h>
> #include <linux/init.h>
> +#include <linux/kernel.h>
>
> #include <linux/uaccess.h>
>
> @@ -404,24 +405,30 @@ static ssize_t pm_qos_power_write(struct
> size_t count, loff_t *f_pos)
> {
> s32 value;
> - int x;
> char ascii_value[11];
> struct pm_qos_request_list *pm_qos_req;
>
> if (count == sizeof(s32)) {
> if (copy_from_user(&value, buf, sizeof(s32)))
> return -EFAULT;
> - } else if (count == 11) { /* len('0x12345678/0') */
> - if (copy_from_user(ascii_value, buf, 11))
> + } else if (count >= 10) { /* '0x12345678' or '0x12345678\n'*/
Did you mean <= 11 here? I know that Alan Stern wanted to see the ABI
adjusted to accept shorter hex string that the full 10 char string.
FWIW I'm ok with doing that.
> + unsigned long int ulval;
> + int ret;
> +
> + count = 10;
I kind of wanted to return an error to the user if they violate the
documented format for the hex string. With this code you get a silent
truncation of the lower digits if the string is "0x123456789abcdef"
> + ascii_value[count] = 0;
> + if (copy_from_user(ascii_value, buf, count))
> return -EFAULT;
> - if (strlen(ascii_value) != 10)
> - return -EINVAL;
> - x = sscanf(ascii_value, "%x", &value);
> - if (x != 1)
> +
> + ret = strict_strtoul(ascii_value, 16, &ulval);
> + if (ret){
> + pr_debug("%s, 0x%lx, 0x%x\n", ascii_value, ulval, ret);
> return -EINVAL;
> - pr_debug("%s, %d, 0x%x\n", ascii_value, x, value);
> - } else
> + }
> + value = (s32)lower_32_bits(ulval);
This shouldn't be needed if you are constrained to a hex format of
"0x12345678" but this is more readable. lower_32_bits is a good idea.
--mark
> + } else {
> return -EINVAL;
> + }
>
> pm_qos_req = filp->private_data;
> pm_qos_update_request(pm_qos_req, value);
On Tuesday, May 24, 2011, mark gross wrote:
> On Mon, May 23, 2011 at 09:54:52PM +0200, Rafael J. Wysocki wrote:
> > On Monday, May 23, 2011, mark gross wrote:
> > > On Mon, May 23, 2011 at 03:06:36PM +1000, Stephen Rothwell wrote:
> > > > Hi Rafael,
> > > >
> > > > After merging the suspend tree, today's linux-next build (i386 defconfig
> > > > among others) produced this warning:
> > > >
> > > > kernel/pm_qos_params.c: In function 'pm_qos_power_write':
> > > > kernel/pm_qos_params.c:420: warning: passing argument 3 of 'kstrtol' from incompatible pointer type
> > > > include/linux/kernel.h:210: note: expected 'long int *' but argument is of type 's32 *'
> > > >
> > > > Intreoduced by commit 365daa955e03 ("PM: Correct PM QOS's user mode
> > > > interface to work with ascii input per").
> > >
> > > Gah! I'm sorry about that.
> > >
> > > attached is a fix.
> > >
> > >
> > > --mark
> > >
> > > signed-off-by:markgross <[email protected]>
> > >
> > >
> > >
> > > From a8f0587b9ae598be5ca4c3cdda4e0ced6ca9baaf Mon Sep 17 00:00:00 2001
> > > From: mgross <mgross@cr48>
> > > Date: Mon, 23 May 2011 07:14:09 -0700
> > > Subject: [PATCH] clean up a compile time warning in the use of strict_strtol but that was
> > > passing an s32 * when it should be passing a long *
> > >
> > > ---
> > > kernel/pm_qos_params.c | 6 ++++--
> > > 1 files changed, 4 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c
> > > index d61ecf3..dd37c56 100644
> > > --- a/kernel/pm_qos_params.c
> > > +++ b/kernel/pm_qos_params.c
> > > @@ -405,6 +405,7 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> > > size_t count, loff_t *f_pos)
> > > {
> > > s32 value;
> > > + long safe_int;
> > > int x;
> > > char ascii_value[11];
> > > struct pm_qos_request_list *pm_qos_req;
> > > @@ -417,10 +418,11 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> > > ascii_value[count] = 0;
> > > if (copy_from_user(ascii_value, buf, count))
> > > return -EFAULT;
> > > - if ((x=strict_strtol(ascii_value, 16, &value)) != 0){
> > > - pr_debug("%s, 0x%x, 0x%x\n",ascii_value, value, x);
> > > + if ((x=strict_strtol(ascii_value, 16, &safe_int)) != 0){
> > > + pr_debug("%s, 0x%lx, 0x%x\n",ascii_value, safe_int, x);
> > > return -EINVAL;
> > > }
> > > + value = (s32) safe_int;
> >
> > Well, this doesn't seem quite right.
> >
> > > } else
> > > return -EINVAL;
> >
> > Besides, if count == 11, there we'll write beyond ascii_value[], right?
>
> right. That is a bug.
>
> >
> > What about the appended patch instead of your original one?
> Thank you!
>
> > Rafael
> >
> >
> > ---
> > From: mark gross <[email protected]>
> > Subject: PM: Correct PM QOS's user mode interface to work with ascii input per
> >
> > What is in the kernel docs. Writing a string to the ABI from user mode
> > comes in 2 flavors. One with and one without a '\n' at the end. This
> > change accepts both.
> >
> > # echo 0x12345678 > /dev/cpu_dma_latency
> >
> > and
> >
> > # echo -n 0x12345678 > /dev/cpu_dma_latency
> >
> > now both work.
> >
> > [rjw: Fixed up array bounds checking and type casting.]
> >
> > Signed-off-by: mark gross <[email protected]>
> > Acked-by: Simon Horman <[email protected]>
> > Signed-off-by: Rafael J. Wysocki <[email protected]>
> > ---
> > kernel/pm_qos_params.c | 25 ++++++++++++++++---------
> > 1 file changed, 16 insertions(+), 9 deletions(-)
> >
> > Index: linux-2.6/kernel/pm_qos_params.c
> > ===================================================================
> > --- linux-2.6.orig/kernel/pm_qos_params.c
> > +++ linux-2.6/kernel/pm_qos_params.c
> > @@ -40,6 +40,7 @@
> > #include <linux/string.h>
> > #include <linux/platform_device.h>
> > #include <linux/init.h>
> > +#include <linux/kernel.h>
> >
> > #include <linux/uaccess.h>
> >
> > @@ -404,24 +405,30 @@ static ssize_t pm_qos_power_write(struct
> > size_t count, loff_t *f_pos)
> > {
> > s32 value;
> > - int x;
> > char ascii_value[11];
> > struct pm_qos_request_list *pm_qos_req;
> >
> > if (count == sizeof(s32)) {
> > if (copy_from_user(&value, buf, sizeof(s32)))
> > return -EFAULT;
> > - } else if (count == 11) { /* len('0x12345678/0') */
> > - if (copy_from_user(ascii_value, buf, 11))
> > + } else if (count >= 10) { /* '0x12345678' or '0x12345678\n'*/
> Did you mean <= 11 here? I know that Alan Stern wanted to see the ABI
> adjusted to accept shorter hex string that the full 10 char string.
>
> FWIW I'm ok with doing that.
>
> > + unsigned long int ulval;
> > + int ret;
> > +
> > + count = 10;
>
> I kind of wanted to return an error to the user if they violate the
> documented format for the hex string. With this code you get a silent
> truncation of the lower digits if the string is "0x123456789abcdef"
That's correct, but with the previous code there will be a truncation
is "echo -n 0x123456789". If we don't want that, we should check if the
last character is a '\n'.
> > + ascii_value[count] = 0;
> > + if (copy_from_user(ascii_value, buf, count))
> > return -EFAULT;
> > - if (strlen(ascii_value) != 10)
> > - return -EINVAL;
> > - x = sscanf(ascii_value, "%x", &value);
> > - if (x != 1)
> > +
> > + ret = strict_strtoul(ascii_value, 16, &ulval);
> > + if (ret){
> > + pr_debug("%s, 0x%lx, 0x%x\n", ascii_value, ulval, ret);
> > return -EINVAL;
> > - pr_debug("%s, %d, 0x%x\n", ascii_value, x, value);
> > - } else
> > + }
> > + value = (s32)lower_32_bits(ulval);
> This shouldn't be needed if you are constrained to a hex format of
> "0x12345678" but this is more readable. lower_32_bits is a good idea.
OK
Appended is another patch that adds the '\n' check and reworks the code
a bit (so that it will accept strings like "0x1" too).
Thanks,
Rafael
---
From: Rafael J. Wysocki <[email protected]>
Subject: PM: Fix PM QOS's user mode interface to work with ASCII input
Make pm_qos_power_write() accept values passed to it in the ASCII hex
format either with or without an ending newline.
Signed-off-by: Rafael J. Wysocki <[email protected]>
---
kernel/pm_qos_params.c | 33 +++++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
Index: linux-2.6/kernel/pm_qos_params.c
===================================================================
--- linux-2.6.orig/kernel/pm_qos_params.c
+++ linux-2.6/kernel/pm_qos_params.c
@@ -40,6 +40,7 @@
#include <linux/string.h>
#include <linux/platform_device.h>
#include <linux/init.h>
+#include <linux/kernel.h>
#include <linux/uaccess.h>
@@ -404,24 +405,36 @@ static ssize_t pm_qos_power_write(struct
size_t count, loff_t *f_pos)
{
s32 value;
- int x;
- char ascii_value[11];
struct pm_qos_request_list *pm_qos_req;
if (count == sizeof(s32)) {
if (copy_from_user(&value, buf, sizeof(s32)))
return -EFAULT;
- } else if (count == 11) { /* len('0x12345678/0') */
- if (copy_from_user(ascii_value, buf, 11))
+ } else if (count <= 11) { /* ASCII perhaps? */
+ char ascii_value[11];
+ unsigned long int ulval;
+ int ret;
+
+ if (copy_from_user(ascii_value, buf, count))
return -EFAULT;
- if (strlen(ascii_value) != 10)
- return -EINVAL;
- x = sscanf(ascii_value, "%x", &value);
- if (x != 1)
+
+ if (count > 10) {
+ if (ascii_value[10] == '\n')
+ ascii_value[10] = '\0';
+ else
+ return -EINVAL;
+ } else {
+ ascii_value[count] = '\0';
+ }
+ ret = strict_strtoul(ascii_value, 16, &ulval);
+ if (ret) {
+ pr_debug("%s, 0x%lx, 0x%x\n", ascii_value, ulval, ret);
return -EINVAL;
- pr_debug("%s, %d, 0x%x\n", ascii_value, x, value);
- } else
+ }
+ value = (s32)lower_32_bits(ulval);
+ } else {
return -EINVAL;
+ }
pm_qos_req = filp->private_data;
pm_qos_update_request(pm_qos_req, value);
On Tue, May 24, 2011 at 11:30:09PM +0200, Rafael J. Wysocki wrote:
> On Tuesday, May 24, 2011, mark gross wrote:
> > On Mon, May 23, 2011 at 09:54:52PM +0200, Rafael J. Wysocki wrote:
> > > On Monday, May 23, 2011, mark gross wrote:
> > > > On Mon, May 23, 2011 at 03:06:36PM +1000, Stephen Rothwell wrote:
> > > > > Hi Rafael,
> > > > >
> > > > > After merging the suspend tree, today's linux-next build (i386 defconfig
> > > > > among others) produced this warning:
> > > > >
> > > > > kernel/pm_qos_params.c: In function 'pm_qos_power_write':
> > > > > kernel/pm_qos_params.c:420: warning: passing argument 3 of 'kstrtol' from incompatible pointer type
> > > > > include/linux/kernel.h:210: note: expected 'long int *' but argument is of type 's32 *'
> > > > >
> > > > > Intreoduced by commit 365daa955e03 ("PM: Correct PM QOS's user mode
> > > > > interface to work with ascii input per").
> > > >
> > > > Gah! I'm sorry about that.
> > > >
> > > > attached is a fix.
> > > >
> > > >
> > > > --mark
> > > >
> > > > signed-off-by:markgross <[email protected]>
> > > >
> > > >
> > > >
> > > > From a8f0587b9ae598be5ca4c3cdda4e0ced6ca9baaf Mon Sep 17 00:00:00 2001
> > > > From: mgross <mgross@cr48>
> > > > Date: Mon, 23 May 2011 07:14:09 -0700
> > > > Subject: [PATCH] clean up a compile time warning in the use of strict_strtol but that was
> > > > passing an s32 * when it should be passing a long *
> > > >
> > > > ---
> > > > kernel/pm_qos_params.c | 6 ++++--
> > > > 1 files changed, 4 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c
> > > > index d61ecf3..dd37c56 100644
> > > > --- a/kernel/pm_qos_params.c
> > > > +++ b/kernel/pm_qos_params.c
> > > > @@ -405,6 +405,7 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> > > > size_t count, loff_t *f_pos)
> > > > {
> > > > s32 value;
> > > > + long safe_int;
> > > > int x;
> > > > char ascii_value[11];
> > > > struct pm_qos_request_list *pm_qos_req;
> > > > @@ -417,10 +418,11 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> > > > ascii_value[count] = 0;
> > > > if (copy_from_user(ascii_value, buf, count))
> > > > return -EFAULT;
> > > > - if ((x=strict_strtol(ascii_value, 16, &value)) != 0){
> > > > - pr_debug("%s, 0x%x, 0x%x\n",ascii_value, value, x);
> > > > + if ((x=strict_strtol(ascii_value, 16, &safe_int)) != 0){
> > > > + pr_debug("%s, 0x%lx, 0x%x\n",ascii_value, safe_int, x);
> > > > return -EINVAL;
> > > > }
> > > > + value = (s32) safe_int;
> > >
> > > Well, this doesn't seem quite right.
> > >
> > > > } else
> > > > return -EINVAL;
> > >
> > > Besides, if count == 11, there we'll write beyond ascii_value[], right?
> >
> > right. That is a bug.
> >
> > >
> > > What about the appended patch instead of your original one?
> > Thank you!
> >
> > > Rafael
> > >
> > >
> > > ---
> > > From: mark gross <[email protected]>
> > > Subject: PM: Correct PM QOS's user mode interface to work with ascii input per
> > >
> > > What is in the kernel docs. Writing a string to the ABI from user mode
> > > comes in 2 flavors. One with and one without a '\n' at the end. This
> > > change accepts both.
> > >
> > > # echo 0x12345678 > /dev/cpu_dma_latency
> > >
> > > and
> > >
> > > # echo -n 0x12345678 > /dev/cpu_dma_latency
> > >
> > > now both work.
> > >
> > > [rjw: Fixed up array bounds checking and type casting.]
> > >
> > > Signed-off-by: mark gross <[email protected]>
> > > Acked-by: Simon Horman <[email protected]>
> > > Signed-off-by: Rafael J. Wysocki <[email protected]>
> > > ---
> > > kernel/pm_qos_params.c | 25 ++++++++++++++++---------
> > > 1 file changed, 16 insertions(+), 9 deletions(-)
> > >
> > > Index: linux-2.6/kernel/pm_qos_params.c
> > > ===================================================================
> > > --- linux-2.6.orig/kernel/pm_qos_params.c
> > > +++ linux-2.6/kernel/pm_qos_params.c
> > > @@ -40,6 +40,7 @@
> > > #include <linux/string.h>
> > > #include <linux/platform_device.h>
> > > #include <linux/init.h>
> > > +#include <linux/kernel.h>
> > >
> > > #include <linux/uaccess.h>
> > >
> > > @@ -404,24 +405,30 @@ static ssize_t pm_qos_power_write(struct
> > > size_t count, loff_t *f_pos)
> > > {
> > > s32 value;
> > > - int x;
> > > char ascii_value[11];
> > > struct pm_qos_request_list *pm_qos_req;
> > >
> > > if (count == sizeof(s32)) {
> > > if (copy_from_user(&value, buf, sizeof(s32)))
> > > return -EFAULT;
> > > - } else if (count == 11) { /* len('0x12345678/0') */
> > > - if (copy_from_user(ascii_value, buf, 11))
> > > + } else if (count >= 10) { /* '0x12345678' or '0x12345678\n'*/
> > Did you mean <= 11 here? I know that Alan Stern wanted to see the ABI
> > adjusted to accept shorter hex string that the full 10 char string.
> >
> > FWIW I'm ok with doing that.
> >
> > > + unsigned long int ulval;
> > > + int ret;
> > > +
> > > + count = 10;
> >
> > I kind of wanted to return an error to the user if they violate the
> > documented format for the hex string. With this code you get a silent
> > truncation of the lower digits if the string is "0x123456789abcdef"
>
> That's correct, but with the previous code there will be a truncation
> is "echo -n 0x123456789". If we don't want that, we should check if the
> last character is a '\n'.
>
> > > + ascii_value[count] = 0;
> > > + if (copy_from_user(ascii_value, buf, count))
> > > return -EFAULT;
> > > - if (strlen(ascii_value) != 10)
> > > - return -EINVAL;
> > > - x = sscanf(ascii_value, "%x", &value);
> > > - if (x != 1)
> > > +
> > > + ret = strict_strtoul(ascii_value, 16, &ulval);
> > > + if (ret){
> > > + pr_debug("%s, 0x%lx, 0x%x\n", ascii_value, ulval, ret);
> > > return -EINVAL;
> > > - pr_debug("%s, %d, 0x%x\n", ascii_value, x, value);
> > > - } else
> > > + }
> > > + value = (s32)lower_32_bits(ulval);
> > This shouldn't be needed if you are constrained to a hex format of
> > "0x12345678" but this is more readable. lower_32_bits is a good idea.
>
> OK
>
> Appended is another patch that adds the '\n' check and reworks the code
> a bit (so that it will accept strings like "0x1" too).
>
> Thanks,
> Rafael
>
>
> ---
> From: Rafael J. Wysocki <[email protected]>
> Subject: PM: Fix PM QOS's user mode interface to work with ASCII input
>
> Make pm_qos_power_write() accept values passed to it in the ASCII hex
> format either with or without an ending newline.
>
> Signed-off-by: Rafael J. Wysocki <[email protected]>
> ---
> kernel/pm_qos_params.c | 33 +++++++++++++++++++++++----------
> 1 file changed, 23 insertions(+), 10 deletions(-)
>
> Index: linux-2.6/kernel/pm_qos_params.c
> ===================================================================
> --- linux-2.6.orig/kernel/pm_qos_params.c
> +++ linux-2.6/kernel/pm_qos_params.c
> @@ -40,6 +40,7 @@
> #include <linux/string.h>
> #include <linux/platform_device.h>
> #include <linux/init.h>
> +#include <linux/kernel.h>
>
> #include <linux/uaccess.h>
>
> @@ -404,24 +405,36 @@ static ssize_t pm_qos_power_write(struct
> size_t count, loff_t *f_pos)
> {
> s32 value;
> - int x;
> - char ascii_value[11];
> struct pm_qos_request_list *pm_qos_req;
>
> if (count == sizeof(s32)) {
> if (copy_from_user(&value, buf, sizeof(s32)))
> return -EFAULT;
> - } else if (count == 11) { /* len('0x12345678/0') */
> - if (copy_from_user(ascii_value, buf, 11))
> + } else if (count <= 11) { /* ASCII perhaps? */
> + char ascii_value[11];
> + unsigned long int ulval;
> + int ret;
> +
> + if (copy_from_user(ascii_value, buf, count))
> return -EFAULT;
> - if (strlen(ascii_value) != 10)
> - return -EINVAL;
> - x = sscanf(ascii_value, "%x", &value);
> - if (x != 1)
> +
> + if (count > 10) {
> + if (ascii_value[10] == '\n')
> + ascii_value[10] = '\0';
> + else
> + return -EINVAL;
> + } else {
> + ascii_value[count] = '\0';
> + }
> + ret = strict_strtoul(ascii_value, 16, &ulval);
> + if (ret) {
> + pr_debug("%s, 0x%lx, 0x%x\n", ascii_value, ulval, ret);
> return -EINVAL;
> - pr_debug("%s, %d, 0x%x\n", ascii_value, x, value);
> - } else
> + }
> + value = (s32)lower_32_bits(ulval);
> + } else {
> return -EINVAL;
> + }
>
> pm_qos_req = filp->private_data;
> pm_qos_update_request(pm_qos_req, value);
looks good to me.
Acked-by: markgross <[email protected]>