c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-14 04:00:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic mounting unformatted zvol

Browse Source 
On some older kernels, i.e. 2.6.18, zvol_ioctl_by_inode() may get passed a NULL
file pointer if the user tries to mount a zvol without a filesystem on it.
This change adds checks to prevent a null pointer dereference.

Closes #73.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Ned Bass 2010-10-29 12:13:52 -07:00 committed by Brian Behlendorf
parent 6ee71f5ce3
commit b1c5821375
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/zfs/zvol.c
View File

@ -1002,6 +1002,8 @@ static int
zvol_ioctl_by_inode(struct inode *inode, struct file *file, zvol_ioctl_by_inode(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
if (file == NULL || inode == NULL)
return -EINVAL;
return zvol_ioctl(inode->i_bdev, file->f_mode, cmd, arg); return zvol_ioctl(inode->i_bdev, file->f_mode, cmd, arg);
} }
@ -1010,6 +1012,8 @@ static long
zvol_compat_ioctl_by_inode(struct file *file, zvol_compat_ioctl_by_inode(struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
if (file == NULL)
return -EINVAL;
return zvol_compat_ioctl(file->f_dentry->d_inode->i_bdev, return zvol_compat_ioctl(file->f_dentry->d_inode->i_bdev,
file->f_mode, cmd, arg); file->f_mode, cmd, arg);
} }