summaryrefslogtreecommitdiffstats
path: root/drivers/block/floppy.c
diff options
context:
space:
mode:
authorVlastimil Babka <vbabka@suse.cz>2017-01-04 11:19:31 +0100
committerJens Axboe <axboe@fb.com>2017-01-12 04:47:08 +0100
commit1661f2e21c8bbf922dcb76faf2126a33ffe4cddb (patch)
tree337d6d186a2b8e557020202ae2fd6935cf513cb7 /drivers/block/floppy.c
parentLinux 4.10-rc3 (diff)
downloadlinux-1661f2e21c8bbf922dcb76faf2126a33ffe4cddb.tar.xz
linux-1661f2e21c8bbf922dcb76faf2126a33ffe4cddb.zip
floppy: replace wrong kmalloc(GFP_USER) with GFP_KERNEL
The raw_cmd_copyin() function does a kmalloc() with GFP_USER, although the allocated structure is obviously not mapped to userspace, just copied from/to. In this case GFP_KERNEL is more appropriate, so let's use it, although in the current implementation this does not manifest as any error. Reported-by: Matthew Wilcox <mawilcox@linuxonhyperv.com> Signed-off-by: Vlastimil Babka <vbabka@suse.cz> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to '')
-rw-r--r--drivers/block/floppy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index a391a3cfb3fe..184887af4b9f 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3119,7 +3119,7 @@ static int raw_cmd_copyin(int cmd, void __user *param,
*rcmd = NULL;
loop:
- ptr = kmalloc(sizeof(struct floppy_raw_cmd), GFP_USER);
+ ptr = kmalloc(sizeof(struct floppy_raw_cmd), GFP_KERNEL);
if (!ptr)
return -ENOMEM;
*rcmd = ptr;