diff options
| author | Seth Forshee <seth.forshee@canonical.com> | 2016-05-05 10:52:38 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-07 18:23:42 -0700 |
| commit | e0df369860a0bb5b1b1238c2d734b3784ed4b119 (patch) | |
| tree | 61f01c85f77d43c8e7a4e99e99e6bc94f0e85aec /fs | |
| parent | 447b62eddcfb060449dd1e1269c128d7aede5450 (diff) | |
| download | lwn-e0df369860a0bb5b1b1238c2d734b3784ed4b119.tar.gz lwn-e0df369860a0bb5b1b1238c2d734b3784ed4b119.zip | |
ext4: fix check of dqget() return value in ext4_ioctl_setproject()
commit ff0bc08454917964291f72ee5b8eca66de4bc250 upstream.
A failed call to dqget() returns an ERR_PTR() and not null. Fix
the check in ext4_ioctl_setproject() to handle this correctly.
Fixes: 9b7365fc1c82 ("ext4: add FS_IOC_FSSETXATTR/FS_IOC_FSGETXATTR interface support")
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index eae5917c534e..0acf8cacb2be 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -365,7 +365,7 @@ static int ext4_ioctl_setproject(struct file *filp, __u32 projid) struct dquot *transfer_to[MAXQUOTAS] = { }; transfer_to[PRJQUOTA] = dqget(sb, make_kqid_projid(kprojid)); - if (transfer_to[PRJQUOTA]) { + if (!IS_ERR(transfer_to[PRJQUOTA])) { err = __dquot_transfer(inode, transfer_to); dqput(transfer_to[PRJQUOTA]); if (err) |