diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-05 13:50:11 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-05 13:50:11 +0400 |
| commit | fe547d7714783ff77719f05a6712554cb4eeecc0 (patch) | |
| tree | 6b25e2820818e732b4774f4e684c1a9a7830b38f | |
| parent | 3296944e29a048c06c5d724ef5c2c8c6e1297161 (diff) | |
| parent | d4b0bcf32b946590afd29e202d6a399b84fe6c67 (diff) | |
| download | linux-fe547d7714783ff77719f05a6712554cb4eeecc0.tar.xz | |
Merge branch 'fix-max-write' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm fix from David Teigland:
"Thanks to Jana who reported the problem and was able to test this fix
so quickly."
This fixes an incorrect size check that triggered for CONFIG_COMPAT
whether the code was actually doing compat or not. The incorrect write
size check broke userland (clvmd) when maximum resource name lengths are
used.
* 'fix-max-write' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
dlm: check the write size from user
| -rw-r--r-- | fs/dlm/user.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/dlm/user.c b/fs/dlm/user.c index 7ff49852b0cb..911649a47dd5 100644 --- a/fs/dlm/user.c +++ b/fs/dlm/user.c @@ -503,11 +503,11 @@ static ssize_t device_write(struct file *file, const char __user *buf, #endif return -EINVAL; -#ifdef CONFIG_COMPAT - if (count > sizeof(struct dlm_write_request32) + DLM_RESNAME_MAXLEN) -#else + /* + * can't compare against COMPAT/dlm_write_request32 because + * we don't yet know if is64bit is zero + */ if (count > sizeof(struct dlm_write_request) + DLM_RESNAME_MAXLEN) -#endif return -EINVAL; kbuf = kzalloc(count + 1, GFP_NOFS); |