diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-10 10:18:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-10 10:18:27 -0800 |
| commit | 41f81e88e01eb959f439f8537c58078e4bfc5291 (patch) | |
| tree | 3d5dba6982a074bcd5f3248c57679215e5f8b701 /fs/xfs/linux-2.6/xfs_ioctl32.c | |
| parent | dc3d532a1792263ec9b26c1cbc7ce566056b5b1f (diff) | |
| parent | cf10e82bdc0d38d09dfaf46d0daf56136138ef3f (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
[XFS] Fix xfs_ichgtime()s broken usage of I_SYNC
[XFS] Make xfsbufd threads freezable
[XFS] revert to double-buffering readdir
[XFS] Fix broken inode cluster setup.
[XFS] Clear XBF_READ_AHEAD flag on I/O completion.
[XFS] Fixed a few bugs in xfs_buf_associate_memory()
[XFS] 971064 Various fixups for xfs_bulkstat().
[XFS] Fix dbflush panic in xfs_qm_sync.
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( if ((count = bulkreq.icount) <= 0) return -XFS_ERROR(EINVAL); + if (bulkreq.ubuffer == NULL) + return -XFS_ERROR(EINVAL); + if (cmd == XFS_IOC_FSINUMBERS) error = xfs_inumbers(mp, &inlast, &count, bulkreq.ubuffer, xfs_inumbers_fmt_compat); |