leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/staging/speakup/devsynth.c: fix "buffer size is not provably correct" error

Browse Source 
x86_64 allmodconfig:

In file included from arch/x86/include/asm/uaccess.h:572,
                 from include/linux/uaccess.h:5,
                 from drivers/staging/speakup/devsynth.c:4:
In function 'copy_from_user',
    inlined from 'speakup_file_write' at drivers/staging/speakup/devsynth.c:28:
arch/x86/include/asm/uaccess_64.h:64: error: call to 'copy_from_user_overflow' declared with attribute error: copy_from_user() buffer size is not provably correct

I'm not sure what was unprovable about it, but size_t is the correct type
anyway.

Also replace needless min_t() with min()

Cc: William Hubbs <w.d.hubbs@gmail.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Andrew Morton 2011-07-28 13:59:35 -07:00 committed by Greg Kroah-Hartman
parent 8f89615528
commit 09f9390d79
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/speakup/devsynth.c
View File

@ -18,13 +18,14 @@ static ssize_t speakup_file_write(struct file *fp, const char *buffer,
{ {
size_t count = nbytes; size_t count = nbytes;
const char *ptr = buffer; const char *ptr = buffer;
int bytes; size_t bytes;
unsigned long flags; unsigned long flags;
u_char buf[256]; u_char buf[256];
if (synth == NULL) if (synth == NULL)
return -ENODEV; return -ENODEV;
while (count > 0) { while (count > 0) {
bytes = min_t(size_t, count, sizeof(buf)); bytes = min(count, sizeof(buf));
if (copy_from_user(buf, ptr, bytes)) if (copy_from_user(buf, ptr, bytes))
return -EFAULT; return -EFAULT;
count -= bytes; count -= bytes;