projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[firefly-linux-kernel-4.4.55.git]
/
block
/
compat_ioctl.c
diff --git
a/block/compat_ioctl.c
b/block/compat_ioctl.c
index c70d0b6f666fff96feb69f97fe9ed30e2990fa19..c23177e4623f1ba73804479460742dd63339556a 100644
(file)
--- a/
block/compat_ioctl.c
+++ b/
block/compat_ioctl.c
@@
-555,7
+555,7
@@
static int compat_blk_trace_setup(struct block_device *bdev, char __user *arg)
if (copy_from_user(&cbuts, arg, sizeof(cbuts)))
return -EFAULT;
-
strcpy(b, bdevname(bdev, b)
);
+
bdevname(bdev, b
);
buts = (struct blk_user_trace_setup) {
.act_mask = cbuts.act_mask,