[NET]: Conversions from kmalloc+memset to k(z|c)alloc.
Signed-off-by: Panagiotis Issaris <takis@issaris.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
a0ee7c70b2
commit
0da974f4f3
@@ -225,9 +225,8 @@ gss_alloc_context(void)
|
||||
{
|
||||
struct gss_cl_ctx *ctx;
|
||||
|
||||
ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
|
||||
ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
|
||||
if (ctx != NULL) {
|
||||
memset(ctx, 0, sizeof(*ctx));
|
||||
ctx->gc_proc = RPC_GSS_PROC_DATA;
|
||||
ctx->gc_seq = 1; /* NetApp 6.4R1 doesn't accept seq. no. 0 */
|
||||
spin_lock_init(&ctx->gc_seq_lock);
|
||||
@@ -391,9 +390,8 @@ gss_alloc_msg(struct gss_auth *gss_auth, uid_t uid)
|
||||
{
|
||||
struct gss_upcall_msg *gss_msg;
|
||||
|
||||
gss_msg = kmalloc(sizeof(*gss_msg), GFP_KERNEL);
|
||||
gss_msg = kzalloc(sizeof(*gss_msg), GFP_KERNEL);
|
||||
if (gss_msg != NULL) {
|
||||
memset(gss_msg, 0, sizeof(*gss_msg));
|
||||
INIT_LIST_HEAD(&gss_msg->list);
|
||||
rpc_init_wait_queue(&gss_msg->rpc_waitqueue, "RPCSEC_GSS upcall waitq");
|
||||
init_waitqueue_head(&gss_msg->waitqueue);
|
||||
@@ -776,10 +774,9 @@ gss_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
|
||||
dprintk("RPC: gss_create_cred for uid %d, flavor %d\n",
|
||||
acred->uid, auth->au_flavor);
|
||||
|
||||
if (!(cred = kmalloc(sizeof(*cred), GFP_KERNEL)))
|
||||
if (!(cred = kzalloc(sizeof(*cred), GFP_KERNEL)))
|
||||
goto out_err;
|
||||
|
||||
memset(cred, 0, sizeof(*cred));
|
||||
atomic_set(&cred->gc_count, 1);
|
||||
cred->gc_uid = acred->uid;
|
||||
/*
|
||||
|
||||
@@ -129,9 +129,8 @@ gss_import_sec_context_kerberos(const void *p,
|
||||
const void *end = (const void *)((const char *)p + len);
|
||||
struct krb5_ctx *ctx;
|
||||
|
||||
if (!(ctx = kmalloc(sizeof(*ctx), GFP_KERNEL)))
|
||||
if (!(ctx = kzalloc(sizeof(*ctx), GFP_KERNEL)))
|
||||
goto out_err;
|
||||
memset(ctx, 0, sizeof(*ctx));
|
||||
|
||||
p = simple_get_bytes(p, end, &ctx->initiate, sizeof(ctx->initiate));
|
||||
if (IS_ERR(p))
|
||||
|
||||
@@ -237,9 +237,8 @@ gss_import_sec_context(const void *input_token, size_t bufsize,
|
||||
struct gss_api_mech *mech,
|
||||
struct gss_ctx **ctx_id)
|
||||
{
|
||||
if (!(*ctx_id = kmalloc(sizeof(**ctx_id), GFP_KERNEL)))
|
||||
if (!(*ctx_id = kzalloc(sizeof(**ctx_id), GFP_KERNEL)))
|
||||
return GSS_S_FAILURE;
|
||||
memset(*ctx_id, 0, sizeof(**ctx_id));
|
||||
(*ctx_id)->mech_type = gss_mech_get(mech);
|
||||
|
||||
return mech->gm_ops
|
||||
|
||||
@@ -152,9 +152,8 @@ gss_import_sec_context_spkm3(const void *p, size_t len,
|
||||
const void *end = (const void *)((const char *)p + len);
|
||||
struct spkm3_ctx *ctx;
|
||||
|
||||
if (!(ctx = kmalloc(sizeof(*ctx), GFP_KERNEL)))
|
||||
if (!(ctx = kzalloc(sizeof(*ctx), GFP_KERNEL)))
|
||||
goto out_err;
|
||||
memset(ctx, 0, sizeof(*ctx));
|
||||
|
||||
p = simple_get_netobj(p, end, &ctx->ctx_id);
|
||||
if (IS_ERR(p))
|
||||
|
||||
@@ -90,10 +90,9 @@ asn1_bitstring_len(struct xdr_netobj *in, int *enclen, int *zerobits)
|
||||
int
|
||||
decode_asn1_bitstring(struct xdr_netobj *out, char *in, int enclen, int explen)
|
||||
{
|
||||
if (!(out->data = kmalloc(explen,GFP_KERNEL)))
|
||||
if (!(out->data = kzalloc(explen,GFP_KERNEL)))
|
||||
return 0;
|
||||
out->len = explen;
|
||||
memset(out->data, 0, explen);
|
||||
memcpy(out->data, in, enclen);
|
||||
return 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user