string: make kmemdup_nul take and return void*, not char*
Subsystems (5)
PATCH 1/2 string: make kmemdup_nul take and return void*, not char*
This allows kmemdup_nul to be used in cases where the source pointer is not a char* or const char*, but the result should nevertheless have a nul char after the memcpy'ed data.
Signed-off-by Rasmus Villemoes <[email protected]>
--- include/linux/string.h | 2 +- mm/util.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/linux/string.h +1 -1
@@ -169,7 +169,7 @@ extern char *kstrdup(const char *s, gfp_t gfp) __malloc;extern const char *kstrdup_const (const char *s,gfp_t gfp);extern char *kstrndup (const char *s,size_t len,gfp_t gfp);extern void *kmemdup (const void *src,size_t len,gfp_t gfp); -extern char *kmemdup_nul (const char *s,size_t len,gfp_t gfp); +extern void *kmemdup_nul (const void *s,size_t len,gfp_t gfp);extern char **argv_split (gfp_t gfp,const char *str,int *argcp);extern void argv_free (char **argv);
mm/util.c +1 -1
@@ -128,7 +128,7 @@ EXPORT_SYMBOL(kmemdup);* @len: The size of the data * @gfp: the GFP mask used in the kmalloc() call when allocating memory */ -char *kmemdup_nul (const char *s,size_t len,gfp_t gfp) +void *kmemdup_nul (const void *s,size_t len,gfp_t gfp) {char *buf;
Signature · 1 line
2.16.4
PATCH 2/2 rxrpc: use kmemdup_nul in rxrpc_krb5_decode_principal
Signed-off-by Rasmus Villemoes <[email protected]>
---
This depends on patch 1/2.
net/rxrpc/key.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
net/rxrpc/key.c +2 -6
@@ -252,11 +252,9 @@ static int rxrpc_krb5_decode_principal(struct krb5_principal *princ, paddedlen = (tmp +3 ) & ~3 ;if (paddedlen > toklen)return -EINVAL ; - princ->name_parts[loop] =kmalloc (tmp +1 ,GFP_KERNEL ); + princ->name_parts[loop] =kmemdup_nul (xdr, tmp,GFP_KERNEL );if (!princ->name_parts[loop])return -ENOMEM ; -memcpy (princ->name_parts[loop], xdr, tmp); - princ->name_parts[loop][tmp] =0 ; toklen -= paddedlen; xdr += paddedlen >>2 ; }
@@ -270,11 +268,9 @@ static int rxrpc_krb5_decode_principal(struct krb5_principal *princ, paddedlen = (tmp +3 ) & ~3 ;if (paddedlen > toklen)return -EINVAL ; - princ->realm =kmalloc (tmp +1 ,GFP_KERNEL ); + princ->realm =kmemdup_nul (xdr, tmp,GFP_KERNEL );if (!princ->realm)return -ENOMEM ; -memcpy (princ->realm, xdr, tmp); - princ->realm[tmp] =0 ; toklen -= paddedlen; xdr += paddedlen >>2 ;
Signature · 1 line
2.16.4
Quoted 3 lines · Rasmus Villemoes
This allows
kmemdup_nulto be used in cases where the source pointer is not a char* or const char*, but the result should nevertheless have a nul char after the memcpy'ed data.
ping