Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e69062b4 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[SUNRPC]: Use k{mem,str}dup where applicable 



Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
parent af997d8c

net/sunrpc/auth_gss/auth_gss.c

+1 −2
Original line number Diff line number Diff line
@@ -198,11 +198,10 @@ simple_get_netobj(const void *p, const void *end, struct xdr_netobj *dest) 
	q = (const void *)((const char *)p + len);

	if (unlikely(q > end || q < p))

		return ERR_PTR(-EFAULT);

	dest->data = kmalloc(len, GFP_KERNEL);

	dest->data = kmemdup(p, len, GFP_KERNEL);

	if (unlikely(dest->data == NULL))

		return ERR_PTR(-ENOMEM);

	dest->len = len;

	memcpy(dest->data, p, len);

	return q;

}

net/sunrpc/auth_gss/gss_krb5_mech.c

+1 −2
Original line number Diff line number Diff line
@@ -70,10 +70,9 @@ simple_get_netobj(const void *p, const void *end, struct xdr_netobj *res) 
	q = (const void *)((const char *)p + len);

	if (unlikely(q > end || q < p))

		return ERR_PTR(-EFAULT);

	res->data = kmalloc(len, GFP_KERNEL);

	res->data = kmemdup(p, len, GFP_KERNEL);

	if (unlikely(res->data == NULL))

		return ERR_PTR(-ENOMEM);

	memcpy(res->data, p, len);

	res->len = len;

	return q;

}

net/sunrpc/auth_gss/gss_spkm3_mech.c

+1 −2
Original line number Diff line number Diff line
@@ -76,10 +76,9 @@ simple_get_netobj(const void *p, const void *end, struct xdr_netobj *res) 
	q = (const void *)((const char *)p + len);

	if (unlikely(q > end || q < p))

		return ERR_PTR(-EFAULT);

	res->data = kmalloc(len, GFP_KERNEL);

	res->data = kmemdup(p, len, GFP_KERNEL);

	if (unlikely(res->data == NULL))

		return ERR_PTR(-ENOMEM);

	memcpy(res->data, p, len);

	return q;

}

net/sunrpc/auth_gss/svcauth_gss.c

+2 −5
Original line number Diff line number Diff line
@@ -113,9 +113,7 @@ static int rsi_match(struct cache_head *a, struct cache_head *b) 
static int dup_to_netobj(struct xdr_netobj *dst, char *src, int len)

{

	dst->len = len;

	dst->data = (len ? kmalloc(len, GFP_KERNEL) : NULL);

	if (dst->data)

		memcpy(dst->data, src, len);

	dst->data = (len ? kmemdup(src, len, GFP_KERNEL) : NULL);

	if (len && !dst->data)

		return -ENOMEM;

	return 0;
@@ -756,10 +754,9 @@ svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name) 
	if (!new)

		goto out;

	kref_init(&new->h.ref);

	new->h.name = kmalloc(strlen(name) + 1, GFP_KERNEL);

	new->h.name = kstrdup(name, GFP_KERNEL);

	if (!new->h.name)

		goto out_free_dom;

	strcpy(new->h.name, name);

	new->h.flavour = &svcauthops_gss;

	new->pseudoflavor = pseudoflavor;

net/sunrpc/clnt.c

+1 −2
Original line number Diff line number Diff line
@@ -253,10 +253,9 @@ rpc_clone_client(struct rpc_clnt *clnt) 
{

	struct rpc_clnt *new;



	new = kmalloc(sizeof(*new), GFP_KERNEL);

	new = kmemdup(clnt, sizeof(*new), GFP_KERNEL);

	if (!new)

		goto out_no_clnt;

	memcpy(new, clnt, sizeof(*new));

	atomic_set(&new->cl_count, 1);

	atomic_set(&new->cl_users, 0);

	new->cl_parent = clnt;