[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20061029200316.GD4900@martell.zuzino.mipt.ru>
Date: Sun, 29 Oct 2006 23:03:16 +0300
From: Alexey Dobriyan <adobriyan@...il.com>
To: Andrew Morton <akpm@...l.org>
Cc: David Howells <dhowells@...hat.com>, linux-kernel@...r.kernel.org,
Eric Sesterhenn <snakebyte@....de>
Subject: [PATCH] security/keys/*: user kmemdup()
From: Eric Sesterhenn <snakebyte@....de>
Signed-off-by: Eric Sesterhenn <snakebyte@....de>
Signed-off-by: Alexey Dobriyan <adobriyan@...il.com>
---
security/keys/key.c | 4 +---
security/keys/keyring.c | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -290,11 +290,9 @@ struct key *key_alloc(struct key_type *t
goto no_memory_2;
if (desc) {
- key->description = kmalloc(desclen, GFP_KERNEL);
+ key->description = kmemdup(desc, desclen, GFP_KERNEL);
if (!key->description)
goto no_memory_3;
-
- memcpy(key->description, desc, desclen);
}
atomic_set(&key->usage, 1);
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -706,12 +706,10 @@ int __key_link(struct key *keyring, stru
BUG_ON(size > PAGE_SIZE);
ret = -ENOMEM;
- nklist = kmalloc(size, GFP_KERNEL);
+ nklist = kmemdup(klist, size, GFP_KERNEL);
if (!nklist)
goto error2;
- memcpy(nklist, klist, size);
-
/* replace matched key */
atomic_inc(&key->usage);
nklist->keys[loop] = key;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists