staging: panel: check put_user() return value
Subsystems (2)
PATCH 5/9 staging: panel: check put_user() return value
put_user() may fail, if so return -EFAULT and do not update driver pointers.
--- drivers/staging/panel/panel.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-)
drivers/staging/panel/panel.c +11 -6
@@ -1589,25 +1589,30 @@ void lcd_init(void)static ssize_t keypad_read (struct file *file,char *buf,size_t count,loff_t *ppos) { - +int buflen = keypad_buflen;unsigned i = *ppos;char *tmp = buf; +int start = keypad_start; -if (keypad_buflen =0 ) { +if (buflen =0 ) {if (file->f_flags &O_NONBLOCK )return -EAGAIN ;interruptible_sleep_on (&keypad_read_wait);if (signal_pending (current))return -EINTR ; + buflen = keypad_buflen; } -for (; count-- >0 && (keypad_buflen >0 ); - ++i, ++tmp, --keypad_buflen) { -put_user (keypad_buffer[keypad_start], tmp); - keypad_start = (keypad_start +1 ) %KEYPAD_BUFFER ; +for (; count-- >0 && (buflen >0 ); + ++i, ++tmp, --buflen) { +if (put_user (keypad_buffer[start], tmp)) +return -EFAULT ; + start = (start +1 ) %KEYPAD_BUFFER ; } *ppos = i; + keypad_buflen = buflen; + keypad_start = start;return tmp - buf; }
Signature · 1 line
1.7.0.4
Quoted 14 lines · Kulikov Vasiliy
drivers/staging/panel/panel.c +2
-1@@ -1589,25 +1589,30 @@ void lcd_init(void)static ssize_t keypad_read (struct file *file,char *buf,size_t count,loff_t *ppos) { - +int buflen = keypad_buflen;unsigned i = *ppos;char *tmp = buf; +int start = keypad_start;
drivers/staging/panel/panel.c void lcd_init(void) · line 1605
Quoted 10 lines
drivers/staging/panel/panel.c +2
-1-if (keypad_buflen =0 ) { +if (buflen =0 ) {if (file->f_flags &O_NONBLOCK )return -EAGAIN ;interruptible_sleep_on (&keypad_read_wait);if (signal_pending (current))return -EINTR ; + buflen = keypad_buflen; }
Not sure what the intent was here, I think you're re-adjusting the buffer's length in case something else was read. But then I don't understand why buflen it not simply assigned after the if() block.
The rest below looks fine otherwise.
Quoted 7 lines
drivers/staging/panel/panel.c +2
-4-for (; count-- >0 && (keypad_buflen >0 ); - ++i, ++tmp, --keypad_buflen) { -put_user (keypad_buffer[keypad_start], tmp); - keypad_start = (keypad_start +1 ) %KEYPAD_BUFFER ; +for (; count-- >0 && (buflen >0 ); + ++i, ++tmp, --buflen) {
drivers/staging/panel/panel.c void lcd_init(void) · line 1618
Quoted 10 lines
drivers/staging/panel/panel.c +5
-0+if (put_user (keypad_buffer[start], tmp)) +return -EFAULT ; + start = (start +1 ) %KEYPAD_BUFFER ; } *ppos = i; + keypad_buflen = buflen; + keypad_start = start;return tmp - buf; }
Regards,
Willy
Quoted 48 lines · Willy Tarreau
Quoted 14 lines · Kulikov Vasiliy
drivers/staging/panel/panel.c +2
-1@@ -1589,25 +1589,30 @@ void lcd_init(void)static ssize_t keypad_read (struct file *file,char *buf,size_t count,loff_t *ppos) { - +int buflen = keypad_buflen;unsigned i = *ppos;char *tmp = buf; +int start = keypad_start;drivers/staging/panel/panel.c void lcd_init(void) · line 1605
Quoted 10 lines
drivers/staging/panel/panel.c +2
-1-if (keypad_buflen =0 ) { +if (buflen =0 ) {if (file->f_flags &O_NONBLOCK )return -EAGAIN ;interruptible_sleep_on (&keypad_read_wait);if (signal_pending (current))return -EINTR ; + buflen = keypad_buflen; }Not sure what the intent was here, I think you're re-adjusting the buffer's length in case something else was read. But then I don't understand why buflen it not simply assigned after the
if()block.The rest below looks fine otherwise.
Quoted 15 lines
drivers/staging/panel/panel.c +7
-4-for (; count-- >0 && (keypad_buflen >0 ); - ++i, ++tmp, --keypad_buflen) { -put_user (keypad_buffer[keypad_start], tmp); - keypad_start = (keypad_start +1 ) %KEYPAD_BUFFER ; +for (; count-- >0 && (buflen >0 ); + ++i, ++tmp, --buflen) { +if (put_user (keypad_buffer[start], tmp)) +return -EFAULT ; + start = (start +1 ) %KEYPAD_BUFFER ; } *ppos = i; + keypad_buflen = buflen; + keypad_start = start;
Quoted 4 lines
drivers/staging/panel/panel.c void lcd_init(void) · line 1618
Quoted 2 lines
drivers/staging/panel/panel.c +0
-0return tmp - buf; }
IMHO opinion the for() construct breaks the rule of "no surprise please". perhaps a while() would improve readability.
just my two cents,
re,
wh