diff options
| author | Jim Meyering <jim@meyering.net> | 2012-04-26 18:35:12 +0200 |
|---|---|---|
| committer | Josef Bacik <josef@redhat.com> | 2012-05-30 16:23:31 +0200 |
| commit | f07c9a79f06cd33b1c9c2c4eacb60bafa7e3f310 (patch) | |
| tree | 73e493a66005d90f73d00cb3b09c6dc8fd5c18a2 /fs/btrfs/super.c | |
| parent | Fix minor type issues (diff) | |
| download | linux-f07c9a79f06cd33b1c9c2c4eacb60bafa7e3f310.tar.xz linux-f07c9a79f06cd33b1c9c2c4eacb60bafa7e3f310.zip | |
Btrfs: avoid buffer overrun in btrfs_printk
The buffer read-overrun would be triggered by a printk format
starting with <N>, where N is a single digit. NUL-terminate
after strncpy. Use memcpy, not strncpy, since we know the
string we're copying fits in the destination buffer and
contains no NUL byte.
Signed-off-by: Jim Meyering <meyering@redhat.com>
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 2cd32175753d..46b26650415f 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -188,7 +188,8 @@ void btrfs_printk(struct btrfs_fs_info *fs_info, const char *fmt, ...) va_start(args, fmt); if (fmt[0] == '<' && isdigit(fmt[1]) && fmt[2] == '>') { - strncpy(lvl, fmt, 3); + memcpy(lvl, fmt, 3); + lvl[3] = '\0'; fmt += 3; type = logtypes[fmt[1] - '0']; } else |