Skip to content

Commit 89f43d1

Browse files
benjamin-42Hashcode
authored andcommitted
md: use kzalloc() when bitmap is disabled
commit b6878d9e03043695dbf3fa1caa6dfc09db225b16 upstream. In drivers/md/md.c get_bitmap_file() uses kmalloc() for creating a mdu_bitmap_file_t called "file". 5769 file = kmalloc(sizeof(*file), GFP_NOIO); 5770 if (!file) 5771 return -ENOMEM; This structure is copied to user space at the end of the function. 5786 if (err == 0 && 5787 copy_to_user(arg, file, sizeof(*file))) 5788 err = -EFAULT But if bitmap is disabled only the first byte of "file" is initialized with zero, so it's possible to read some bytes (up to 4095) of kernel space memory from user space. This is an information leak. 5775 /* bitmap disabled, zero the first byte and copy out */ 5776 if (!mddev->bitmap_info.file) 5777 file->pathname[0] = '\0'; Signed-off-by: Benjamin Randazzo <benjamin@randazzo.fr> Signed-off-by: NeilBrown <neilb@suse.com> [lizf: Backported to 3.4: fix both branches] Signed-off-by: Zefan Li <lizefan@huawei.com>
1 parent 96d589d commit 89f43d1

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/md/md.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5413,9 +5413,9 @@ static int get_bitmap_file(struct mddev * mddev, void __user * arg)
54135413
int err = -ENOMEM;
54145414

54155415
if (md_allow_write(mddev))
5416-
file = kmalloc(sizeof(*file), GFP_NOIO);
5416+
file = kzalloc(sizeof(*file), GFP_NOIO);
54175417
else
5418-
file = kmalloc(sizeof(*file), GFP_KERNEL);
5418+
file = kzalloc(sizeof(*file), GFP_KERNEL);
54195419

54205420
if (!file)
54215421
goto out;

0 commit comments

Comments
 (0)