diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-22 10:24:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-22 10:24:03 -0800 |
| commit | eadee0ce6fd33defe449c97e671bf83fa230b5de (patch) | |
| tree | c159a1cb09accfac1f351ce4fca24ccef9777245 /fs/dlm/user.c | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | [regression] fix braino in fs/dlm/user.c (diff) | |
| download | linux-eadee0ce6fd33defe449c97e671bf83fa230b5de.tar.gz linux-eadee0ce6fd33defe449c97e671bf83fa230b5de.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull more vfs updates from Al Viro:
"Embarrassing braino fix + pipe page accounting + fixing an eyesore in
find_filesystem() (checking that s1 is equal to prefix of s2 of given
length can be done in many ways, but "compare strlen(s1) with length
and then do strncmp()" is not a good one...)"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
[regression] fix braino in fs/dlm/user.c
pipe: limit the per-user amount of pages allocated in pipes
find_filesystem(): simplify comparison
Diffstat (limited to 'fs/dlm/user.c')
| -rw-r--r-- | fs/dlm/user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/user.c b/fs/dlm/user.c index 1925d6d222b8..58c2f4a21b7f 100644 --- a/fs/dlm/user.c +++ b/fs/dlm/user.c @@ -516,7 +516,7 @@ static ssize_t device_write(struct file *file, const char __user *buf, return -EINVAL; kbuf = memdup_user_nul(buf, count); - if (!IS_ERR(kbuf)) + if (IS_ERR(kbuf)) return PTR_ERR(kbuf); if (check_version(kbuf)) { |