diff options
| author | Jean Delvare <khali@linux-fr.org> | 2008-05-12 14:02:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-13 08:02:26 -0700 |
| commit | f36f21ecca9ee688301174e5f2e0827827a7a7ff (patch) | |
| tree | b147bb5cc37683dfe01c86fba634808aa2ff567d /block | |
| parent | 78bb6cb9a890d3d50ca3b02fce9223d3e734ab9b (diff) | |
| download | op-kernel-dev-f36f21ecca9ee688301174e5f2e0827827a7a7ff.zip op-kernel-dev-f36f21ecca9ee688301174e5f2e0827827a7a7ff.tar.gz | |
Fix misuses of bdevname()
bdevname() fills the buffer that it is given as a parameter, so calling
strcpy() or snprintf() on the returned value is redundant (and probably not
guaranteed to work - I don't think strcpy and snprintf support overlapping
buffers.)
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Stephen Tweedie <sct@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blktrace.c | 2 | ||||
| -rw-r--r-- | block/compat_ioctl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/block/blktrace.c b/block/blktrace.c index 568588c..b2cbb4e 100644 --- a/block/blktrace.c +++ b/block/blktrace.c @@ -476,7 +476,7 @@ int blk_trace_ioctl(struct block_device *bdev, unsigned cmd, char __user *arg) switch (cmd) { case BLKTRACESETUP: - strcpy(b, bdevname(bdev, b)); + bdevname(bdev, b); ret = blk_trace_setup(q, b, bdev->bd_dev, arg); break; case BLKTRACESTART: diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c index c70d0b6..c23177e 100644 --- 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, |
