]> bbs.cooldavid.org Git - net-next-2.6.git/commit - fs/btrfs/ioctl.c
Btrfs: Null terminate strings passed in from userspace
authorMark Fasheh <mfasheh@suse.com>
Thu, 24 Jul 2008 16:20:14 +0000 (12:20 -0400)
committerChris Mason <chris.mason@oracle.com>
Thu, 25 Sep 2008 15:04:05 +0000 (11:04 -0400)
commit5516e5957f4b99b19fffffa53bf9fbe7cc793249
treed5d0b0d3850fc37093300920a672b3b051c86a82
parent9652480bf48500885a30754b4a5c436b5b34456d
Btrfs: Null terminate strings passed in from userspace

The 'char name[BTRFS_PATH_NAME_MAX]' member of struct btrfs_ioctl_vol_args
is passed directly to strlen() after being copied from user. I haven't
verified this, but in theory a userspace program could pass in an
unterminated string and cause a kernel crash as strlen walks off the end of
the array.

This patch terminates the ->name string in all btrfs ioctl functions which
currently use a 'struct btrfs_ioctl_vol_args'. Since the string is now
properly terminated, it's length will never be longer than
BTRFS_PATH_NAME_MAX so that error check has been removed.

By the way, it might be better overall to just have the ioctl pass an
unterminated string + length structure but I didn't bother with that since
it'd change the kernel/user interface.

Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/ioctl.c