2010-12-04 03:38:36

by Thiago Farina

Subject: [PATCH] drivers/video/via/viafbdev.c: Check return value of strict_strtoul().

This fix the following warnings:

drivers/video/via/viafbdev.c:1144: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result
drivers/video/via/viafbdev.c:1214: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result
drivers/video/via/viafbdev.c:1272: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result
drivers/video/via/viafbdev.c:1311: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result
drivers/video/via/viafbdev.c:1380: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result
drivers/video/via/viafbdev.c:1417: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result

Signed-off-by: Thiago Farina <[email protected]>
---
drivers/video/via/viafbdev.c | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index d298cfc..7c35100 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -1131,6 +1131,8 @@ static ssize_t viafb_dvp0_proc_write(struct file *file,
char buf[20], *value, *pbuf;
u8 reg_val = 0;
unsigned long length, i;
+ int ret;
+
if (count < 1)
return -EINVAL;
length = count > 20 ? 20 : count;
@@ -1141,7 +1143,10 @@ static ssize_t viafb_dvp0_proc_write(struct file *file,
for (i = 0; i < 3; i++) {
value = strsep(&pbuf, " ");
if (value != NULL) {
- strict_strtoul(value, 0, (unsigned long *)&reg_val);
+ ret = strict_strtoul(value, 0, (unsigned long *)&reg_val);
+ if (ret)
+ return ret;
+
DEBUG_MSG(KERN_INFO "DVP0:reg_val[%l]=:%x\n", i,
reg_val);
switch (i) {
@@ -1201,6 +1206,8 @@ static ssize_t viafb_dvp1_proc_write(struct file *file,
char buf[20], *value, *pbuf;
u8 reg_val = 0;
unsigned long length, i;
+ int ret;
+
if (count < 1)
return -EINVAL;
length = count > 20 ? 20 : count;
@@ -1211,7 +1218,10 @@ static ssize_t viafb_dvp1_proc_write(struct file *file,
for (i = 0; i < 3; i++) {
value = strsep(&pbuf, " ");
if (value != NULL) {
- strict_strtoul(value, 0, (unsigned long *)&reg_val);
+ ret = strict_strtoul(value, 0, (unsigned long *)&reg_val);
+ if (ret)
+ return ret;
+
switch (i) {
case 0:
viafb_write_reg_mask(CR9B, VIACR,
@@ -1263,13 +1273,17 @@ static ssize_t viafb_dfph_proc_write(struct file *file,
char buf[20];
u8 reg_val = 0;
unsigned long length;
+ int ret;
+
if (count < 1)
return -EINVAL;
length = count > 20 ? 20 : count;
if (copy_from_user(&buf[0], buffer, length))
return -EFAULT;
buf[length - 1] = '\0'; /*Ensure end string */
- strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val);
+ ret = strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val);
+ if (ret)
+ return ret;
viafb_write_reg_mask(CR97, VIACR, reg_val, 0x0f);
return count;
}
@@ -1302,13 +1316,17 @@ static ssize_t viafb_dfpl_proc_write(struct file *file,
char buf[20];
u8 reg_val = 0;
unsigned long length;
+ int ret;
+
if (count < 1)
return -EINVAL;
length = count > 20 ? 20 : count;
if (copy_from_user(&buf[0], buffer, length))
return -EFAULT;
buf[length - 1] = '\0'; /*Ensure end string */
- strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val);
+ ret = strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val);
+ if (ret)
+ return ret;
viafb_write_reg_mask(CR99, VIACR, reg_val, 0x0f);
return count;
}
@@ -1365,6 +1383,8 @@ static ssize_t viafb_vt1636_proc_write(struct file *file,
char buf[30], *value, *pbuf;
struct IODATA reg_val;
unsigned long length, i;
+ int ret;
+
if (count < 1)
return -EINVAL;
length = count > 30 ? 30 : count;
@@ -1377,8 +1397,11 @@ static ssize_t viafb_vt1636_proc_write(struct file *file,
for (i = 0; i < 2; i++) {
value = strsep(&pbuf, " ");
if (value != NULL) {
- strict_strtoul(value, 0,
- (unsigned long *)&reg_val.Data);
+ ret = strict_strtoul(value, 0,
+ (unsigned long *)&reg_val.Data);
+ if (ret)
+ return ret;
+
switch (i) {
case 0:
reg_val.Index = 0x08;
@@ -1414,8 +1437,11 @@ static ssize_t viafb_vt1636_proc_write(struct file *file,
for (i = 0; i < 2; i++) {
value = strsep(&pbuf, " ");
if (value != NULL) {
- strict_strtoul(value, 0,
+ ret = strict_strtoul(value, 0,
(unsigned long *)&reg_val.Data);
+ if (ret)
+ return ret;
+
switch (i) {
case 0:
reg_val.Index = 0x08;
--
1.7.3.2.343.g7d43d

2010-12-04 03:57:52

by Thiago Farina

Subject: [PATCH] drivers/video/via/viafbdev.c: Check return value of strict_strtoul().

This fix the following warnings:

drivers/video/via/viafbdev.c:1144: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result
drivers/video/via/viafbdev.c:1214: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result
drivers/video/via/viafbdev.c:1272: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result
drivers/video/via/viafbdev.c:1311: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result
drivers/video/via/viafbdev.c:1380: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result
drivers/video/via/viafbdev.c:1417: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result

Signed-off-by: Thiago Farina <[email protected]>
---
drivers/video/via/viafbdev.c | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index d298cfc..9a53ec3 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -1131,6 +1131,8 @@ static ssize_t viafb_dvp0_proc_write(struct file *file,
char buf[20], *value, *pbuf;
u8 reg_val = 0;
unsigned long length, i;
+ int ret;
+
if (count < 1)
return -EINVAL;
length = count > 20 ? 20 : count;
@@ -1141,7 +1143,10 @@ static ssize_t viafb_dvp0_proc_write(struct file *file,
for (i = 0; i < 3; i++) {
value = strsep(&pbuf, " ");
if (value != NULL) {
- strict_strtoul(value, 0, (unsigned long *)&reg_val);
+ ret = strict_strtoul(value, 0, (unsigned long *)&reg_val);
+ if (ret < 0)
+ return ret;
+
DEBUG_MSG(KERN_INFO "DVP0:reg_val[%l]=:%x\n", i,
reg_val);
switch (i) {
@@ -1201,6 +1206,8 @@ static ssize_t viafb_dvp1_proc_write(struct file *file,
char buf[20], *value, *pbuf;
u8 reg_val = 0;
unsigned long length, i;
+ int ret;
+
if (count < 1)
return -EINVAL;
length = count > 20 ? 20 : count;
@@ -1211,7 +1218,10 @@ static ssize_t viafb_dvp1_proc_write(struct file *file,
for (i = 0; i < 3; i++) {
value = strsep(&pbuf, " ");
if (value != NULL) {
- strict_strtoul(value, 0, (unsigned long *)&reg_val);
+ ret = strict_strtoul(value, 0, (unsigned long *)&reg_val);
+ if (ret < 0)
+ return ret;
+
switch (i) {
case 0:
viafb_write_reg_mask(CR9B, VIACR,
@@ -1263,13 +1273,17 @@ static ssize_t viafb_dfph_proc_write(struct file *file,
char buf[20];
u8 reg_val = 0;
unsigned long length;
+ int ret;
+
if (count < 1)
return -EINVAL;
length = count > 20 ? 20 : count;
if (copy_from_user(&buf[0], buffer, length))
return -EFAULT;
buf[length - 1] = '\0'; /*Ensure end string */
- strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val);
+ ret = strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val);
+ if (ret < 0)
+ return ret;
viafb_write_reg_mask(CR97, VIACR, reg_val, 0x0f);
return count;
}
@@ -1302,13 +1316,17 @@ static ssize_t viafb_dfpl_proc_write(struct file *file,
char buf[20];
u8 reg_val = 0;
unsigned long length;
+ int ret;
+
if (count < 1)
return -EINVAL;
length = count > 20 ? 20 : count;
if (copy_from_user(&buf[0], buffer, length))
return -EFAULT;
buf[length - 1] = '\0'; /*Ensure end string */
- strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val);
+ ret = strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val);
+ if (ret < 0)
+ return ret;
viafb_write_reg_mask(CR99, VIACR, reg_val, 0x0f);
return count;
}
@@ -1365,6 +1383,8 @@ static ssize_t viafb_vt1636_proc_write(struct file *file,
char buf[30], *value, *pbuf;
struct IODATA reg_val;
unsigned long length, i;
+ int ret;
+
if (count < 1)
return -EINVAL;
length = count > 30 ? 30 : count;
@@ -1377,8 +1397,11 @@ static ssize_t viafb_vt1636_proc_write(struct file *file,
for (i = 0; i < 2; i++) {
value = strsep(&pbuf, " ");
if (value != NULL) {
- strict_strtoul(value, 0,
- (unsigned long *)&reg_val.Data);
+ ret = strict_strtoul(value, 0,
+ (unsigned long *)&reg_val.Data);
+ if (ret < 0)
+ return ret;
+
switch (i) {
case 0:
reg_val.Index = 0x08;
@@ -1414,8 +1437,11 @@ static ssize_t viafb_vt1636_proc_write(struct file *file,
for (i = 0; i < 2; i++) {
value = strsep(&pbuf, " ");
if (value != NULL) {
- strict_strtoul(value, 0,
+ ret = strict_strtoul(value, 0,
(unsigned long *)&reg_val.Data);
+ if (ret < 0)
+ return ret;
+
switch (i) {
case 0:
reg_val.Index = 0x08;
--
1.7.3.2.343.g7d43d

2010-12-05 21:37:08

by Florian Tobias Schandinat

Subject: Re: [PATCH] drivers/video/via/viafbdev.c: Check return value of strict_strtoul().

Hi,

Thiago Farina schrieb:
> This fix the following warnings:

You could have made my job easier by
(1) mentioning that the first and the second email you sent are different
(2) highlighting the difference

I think your patch is correct, but I just saw a huge patch series by Alexey
Dobriyan on the LKML with much more invasive changes in this area (basically
eliminating strict_strtoul). I'll keep your second email as a backup but won't
apply it now as it would conflict with the series which obsolates it anyway.


Thanks,

Florian Tobias Schandinat

>
> drivers/video/via/viafbdev.c:1144: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result
> drivers/video/via/viafbdev.c:1214: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result
> drivers/video/via/viafbdev.c:1272: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result
> drivers/video/via/viafbdev.c:1311: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result
> drivers/video/via/viafbdev.c:1380: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result
> drivers/video/via/viafbdev.c:1417: warning: ignoring return value of ‘strict_strtoul’, declared with attribute warn_unused_result
>
> Signed-off-by: Thiago Farina <[email protected]>
> ---
> drivers/video/via/viafbdev.c | 40 +++++++++++++++++++++++++++++++++-------
> 1 files changed, 33 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
> index d298cfc..9a53ec3 100644
> --- a/drivers/video/via/viafbdev.c
> +++ b/drivers/video/via/viafbdev.c
> @@ -1131,6 +1131,8 @@ static ssize_t viafb_dvp0_proc_write(struct file *file,
> char buf[20], *value, *pbuf;
> u8 reg_val = 0;
> unsigned long length, i;
> + int ret;
> +
> if (count < 1)
> return -EINVAL;
> length = count > 20 ? 20 : count;
> @@ -1141,7 +1143,10 @@ static ssize_t viafb_dvp0_proc_write(struct file *file,
> for (i = 0; i < 3; i++) {
> value = strsep(&pbuf, " ");
> if (value != NULL) {
> - strict_strtoul(value, 0, (unsigned long *)&reg_val);
> + ret = strict_strtoul(value, 0, (unsigned long *)&reg_val);
> + if (ret < 0)
> + return ret;
> +
> DEBUG_MSG(KERN_INFO "DVP0:reg_val[%l]=:%x\n", i,
> reg_val);
> switch (i) {
> @@ -1201,6 +1206,8 @@ static ssize_t viafb_dvp1_proc_write(struct file *file,
> char buf[20], *value, *pbuf;
> u8 reg_val = 0;
> unsigned long length, i;
> + int ret;
> +
> if (count < 1)
> return -EINVAL;
> length = count > 20 ? 20 : count;
> @@ -1211,7 +1218,10 @@ static ssize_t viafb_dvp1_proc_write(struct file *file,
> for (i = 0; i < 3; i++) {
> value = strsep(&pbuf, " ");
> if (value != NULL) {
> - strict_strtoul(value, 0, (unsigned long *)&reg_val);
> + ret = strict_strtoul(value, 0, (unsigned long *)&reg_val);
> + if (ret < 0)
> + return ret;
> +
> switch (i) {
> case 0:
> viafb_write_reg_mask(CR9B, VIACR,
> @@ -1263,13 +1273,17 @@ static ssize_t viafb_dfph_proc_write(struct file *file,
> char buf[20];
> u8 reg_val = 0;
> unsigned long length;
> + int ret;
> +
> if (count < 1)
> return -EINVAL;
> length = count > 20 ? 20 : count;
> if (copy_from_user(&buf[0], buffer, length))
> return -EFAULT;
> buf[length - 1] = '\0'; /*Ensure end string */
> - strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val);
> + ret = strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val);
> + if (ret < 0)
> + return ret;
> viafb_write_reg_mask(CR97, VIACR, reg_val, 0x0f);
> return count;
> }
> @@ -1302,13 +1316,17 @@ static ssize_t viafb_dfpl_proc_write(struct file *file,
> char buf[20];
> u8 reg_val = 0;
> unsigned long length;
> + int ret;
> +
> if (count < 1)
> return -EINVAL;
> length = count > 20 ? 20 : count;
> if (copy_from_user(&buf[0], buffer, length))
> return -EFAULT;
> buf[length - 1] = '\0'; /*Ensure end string */
> - strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val);
> + ret = strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val);
> + if (ret < 0)
> + return ret;
> viafb_write_reg_mask(CR99, VIACR, reg_val, 0x0f);
> return count;
> }
> @@ -1365,6 +1383,8 @@ static ssize_t viafb_vt1636_proc_write(struct file *file,
> char buf[30], *value, *pbuf;
> struct IODATA reg_val;
> unsigned long length, i;
> + int ret;
> +
> if (count < 1)
> return -EINVAL;
> length = count > 30 ? 30 : count;
> @@ -1377,8 +1397,11 @@ static ssize_t viafb_vt1636_proc_write(struct file *file,
> for (i = 0; i < 2; i++) {
> value = strsep(&pbuf, " ");
> if (value != NULL) {
> - strict_strtoul(value, 0,
> - (unsigned long *)&reg_val.Data);
> + ret = strict_strtoul(value, 0,
> + (unsigned long *)&reg_val.Data);
> + if (ret < 0)
> + return ret;
> +
> switch (i) {
> case 0:
> reg_val.Index = 0x08;
> @@ -1414,8 +1437,11 @@ static ssize_t viafb_vt1636_proc_write(struct file *file,
> for (i = 0; i < 2; i++) {
> value = strsep(&pbuf, " ");
> if (value != NULL) {
> - strict_strtoul(value, 0,
> + ret = strict_strtoul(value, 0,
> (unsigned long *)&reg_val.Data);
> + if (ret < 0)
> + return ret;
> +
> switch (i) {
> case 0:
> reg_val.Index = 0x08;

2010-12-06 15:18:27

by Alexey Dobriyan

Subject: Re: [PATCH] drivers/video/via/viafbdev.c: Check return value of strict_strtoul().

On Sat, Dec 4, 2010 at 5:38 AM, Thiago Farina <[email protected]> wrote:
> This fix the following warnings:
>
> drivers/video/via/viafbdev.c:1144: warning: ignoring return value of ?strict_strtoul?, declared with attribute warn_unused_result

I send patches to convert this code to kstrto*() interfaces,
so this patch would be redundant.