diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:29:41 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:30:32 -0500 |
| commit | c1f3ee120bb61045b1c0a3ead620d1d65af47130 (patch) | |
| tree | 908430bf2b47fe8e96ac623ae7ab6dd5698d0938 /fs/xfs/linux-2.6/xfs_ioctl32.c | |
| parent | e619a75ff6201b567a539e787aa9af9bc63a3187 (diff) | |
| parent | 9135f1901ee6449dfe338adf6e40e9c2025b8150 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_ioctl32.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl32.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.c b/fs/xfs/linux-2.6/xfs_ioctl32.c index 0046bdd5b7f1..bf2a956b63c2 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl32.c +++ b/fs/xfs/linux-2.6/xfs_ioctl32.c | |||
| @@ -291,6 +291,9 @@ xfs_ioc_bulkstat_compat( | |||
| 291 | if ((count = bulkreq.icount) <= 0) | 291 | if ((count = bulkreq.icount) <= 0) |
| 292 | return -XFS_ERROR(EINVAL); | 292 | return -XFS_ERROR(EINVAL); |
| 293 | 293 | ||
| 294 | if (bulkreq.ubuffer == NULL) | ||
| 295 | return -XFS_ERROR(EINVAL); | ||
| 296 | |||
| 294 | if (cmd == XFS_IOC_FSINUMBERS) | 297 | if (cmd == XFS_IOC_FSINUMBERS) |
| 295 | error = xfs_inumbers(mp, &inlast, &count, | 298 | error = xfs_inumbers(mp, &inlast, &count, |
| 296 | bulkreq.ubuffer, xfs_inumbers_fmt_compat); | 299 | bulkreq.ubuffer, xfs_inumbers_fmt_compat); |