diff options
author | David Teigland <teigland@redhat.com> | 2008-07-29 16:21:19 -0400 |
---|---|---|
committer | David Teigland <teigland@redhat.com> | 2008-08-13 13:47:36 -0400 |
commit | cb980d9a3ec3d39e30e0a4c473df528c09e0dcf3 (patch) | |
tree | 817fd390f15904ef0b14b22b4b8c7a2055514337 /fs/dlm/user.c | |
parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) |
dlm: add missing kfrees
A couple of unlikely error conditions were missing a kfree on the error
exit path.
Reported-by: Juha Leppanen <juha_motorsportcom@luukku.com>
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/user.c')
-rw-r--r-- | fs/dlm/user.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/dlm/user.c b/fs/dlm/user.c index 929e48ae7591..34f14a14fb4e 100644 --- a/fs/dlm/user.c +++ b/fs/dlm/user.c | |||
@@ -527,8 +527,10 @@ static ssize_t device_write(struct file *file, const char __user *buf, | |||
527 | k32buf = (struct dlm_write_request32 *)kbuf; | 527 | k32buf = (struct dlm_write_request32 *)kbuf; |
528 | kbuf = kmalloc(count + 1 + (sizeof(struct dlm_write_request) - | 528 | kbuf = kmalloc(count + 1 + (sizeof(struct dlm_write_request) - |
529 | sizeof(struct dlm_write_request32)), GFP_KERNEL); | 529 | sizeof(struct dlm_write_request32)), GFP_KERNEL); |
530 | if (!kbuf) | 530 | if (!kbuf) { |
531 | kfree(k32buf); | ||
531 | return -ENOMEM; | 532 | return -ENOMEM; |
533 | } | ||
532 | 534 | ||
533 | if (proc) | 535 | if (proc) |
534 | set_bit(DLM_PROC_FLAGS_COMPAT, &proc->flags); | 536 | set_bit(DLM_PROC_FLAGS_COMPAT, &proc->flags); |
@@ -539,8 +541,10 @@ static ssize_t device_write(struct file *file, const char __user *buf, | |||
539 | 541 | ||
540 | /* do we really need this? can a write happen after a close? */ | 542 | /* do we really need this? can a write happen after a close? */ |
541 | if ((kbuf->cmd == DLM_USER_LOCK || kbuf->cmd == DLM_USER_UNLOCK) && | 543 | if ((kbuf->cmd == DLM_USER_LOCK || kbuf->cmd == DLM_USER_UNLOCK) && |
542 | (proc && test_bit(DLM_PROC_FLAGS_CLOSING, &proc->flags))) | 544 | (proc && test_bit(DLM_PROC_FLAGS_CLOSING, &proc->flags))) { |
543 | return -EINVAL; | 545 | error = -EINVAL; |
546 | goto out_free; | ||
547 | } | ||
544 | 548 | ||
545 | sigfillset(&allsigs); | 549 | sigfillset(&allsigs); |
546 | sigprocmask(SIG_BLOCK, &allsigs, &tmpsig); | 550 | sigprocmask(SIG_BLOCK, &allsigs, &tmpsig); |