diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-06-30 13:50:42 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-07-19 09:18:38 +0200 |
| commit | 3f5d2521dc8a4f7742bbe5bd079c8f91c61cba86 (patch) | |
| tree | 5a9d42a885897f4cd69f0916767ae3ac56ba9a67 /ncr-limits.c | |
| parent | 5a2514f9e9b946ac8fff6c8fc80aec335c3e3454 (diff) | |
| download | cryptodev-linux-3f5d2521dc8a4f7742bbe5bd079c8f91c61cba86.tar.gz cryptodev-linux-3f5d2521dc8a4f7742bbe5bd079c8f91c61cba86.tar.xz cryptodev-linux-3f5d2521dc8a4f7742bbe5bd079c8f91c61cba86.zip | |
Fix error paths in ncr_limits_add_and_check
Diffstat (limited to 'ncr-limits.c')
| -rw-r--r-- | ncr-limits.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/ncr-limits.c b/ncr-limits.c index 378233c..73f148b 100644 --- a/ncr-limits.c +++ b/ncr-limits.c @@ -98,6 +98,7 @@ int ncr_limits_add_and_check(uid_t uid, pid_t pid, limits_type_t type) struct limit_process_item_st* pitem; struct limit_user_item_st* uitem; int add = 1; +int ret; down(&limits.users.sem); list_for_each_entry(uitem, &limits.users.list, list) { @@ -116,6 +117,7 @@ int add = 1; uitem = kmalloc( sizeof(*uitem), GFP_KERNEL); if (uitem == NULL) { err(); + up(&limits.users.sem); return -ENOMEM; } uitem->uid = uid; @@ -135,7 +137,9 @@ int add = 1; if (atomic_add_unless(&pitem->cnt, 1, max_per_process[type])==0) { err(); up(&limits.processes.sem); - return -EPERM; + + ret = -EPERM; + goto restore_user; } } } @@ -145,7 +149,9 @@ int add = 1; pitem = kmalloc(sizeof(*pitem), GFP_KERNEL); if (uitem == NULL) { err(); - return -ENOMEM; + up(&limits.processes.sem); + ret = -ENOMEM; + goto restore_user; } pitem->pid = task_pid_nr(current); pitem->type = type; @@ -156,6 +162,15 @@ int add = 1; up(&limits.processes.sem); return 0; + +restore_user: + down(&limits.users.sem); + list_for_each_entry(uitem, &limits.users.list, list) { + if (uitem->uid == uid && uitem->type == type) + atomic_dec(&uitem->cnt); + } + up(&limits.users.sem); + return ret; } void ncr_limits_remove(uid_t uid, pid_t pid, limits_type_t type) |