lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs: cifs: use kmemdup instead of kmalloc + memcpy

Browse Source 
This replaces calls to kmalloc followed by memcpy with a single call to
kmemdup. This was found via make coccicheck.

Signed-off-by: Silviu-Mihai Popescu <silviupopescu1990@gmail.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Signed-off-by: Steve French <smfrench@gmail.com>
This commit is contained in:
Silviu-Mihai Popescu 2013-03-11 18:22:32 +02:00 committed by Steve French
parent d455b72bdd
commit f7f7c1850e
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/cifs/cifs_spnego.c
View File

@ -37,12 +37,11 @@ cifs_spnego_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
int ret; int ret;
ret = -ENOMEM; ret = -ENOMEM;
payload = kmalloc(prep->datalen, GFP_KERNEL); payload = kmemdup(prep->data, prep->datalen, GFP_KERNEL);
if (!payload) if (!payload)
goto error; goto error;
/* attach the data */ /* attach the data */
memcpy(payload, prep->data, prep->datalen);
key->payload.data = payload; key->payload.data = payload;
ret = 0; ret = 0;

3
fs/cifs/cifsacl.c
View File

@ -63,11 +63,10 @@ cifs_idmap_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
key->datalen = prep->datalen; key->datalen = prep->datalen;
return 0; return 0;
} }
payload = kmalloc(prep->datalen, GFP_KERNEL); payload = kmemdup(prep->data, prep->datalen, GFP_KERNEL);
if (!payload) if (!payload)
return -ENOMEM; return -ENOMEM;
memcpy(payload, prep->data, prep->datalen);
key->payload.data = payload; key->payload.data = payload;
key->datalen = prep->datalen; key->datalen = prep->datalen;
return 0; return 0;

3
fs/cifs/cifssmb.c
View File

@ -3742,12 +3742,11 @@ CIFSSMBGetCIFSACL(const unsigned int xid, struct cifs_tcon *tcon, __u16 fid,
rc = -EINVAL; rc = -EINVAL;
*pbuflen = 0; *pbuflen = 0;
} else { } else {
*acl_inf = kmalloc(*pbuflen, GFP_KERNEL); *acl_inf = kmemdup(pdata, *pbuflen, GFP_KERNEL);
if (*acl_inf == NULL) { if (*acl_inf == NULL) {
*pbuflen = 0; *pbuflen = 0;
rc = -ENOMEM; rc = -ENOMEM;
} }
memcpy(*acl_inf, pdata, *pbuflen);
} }
} }
qsec_out: qsec_out:

8
fs/cifs/sess.c
View File

@ -399,12 +399,12 @@ int decode_ntlmssp_challenge(char *bcc_ptr, int blob_len,
return -EINVAL; return -EINVAL;
} }
if (tilen) { if (tilen) {
ses->auth_key.response = kmalloc(tilen, GFP_KERNEL); ses->auth_key.response = kmemdup(bcc_ptr + tioffset, tilen,
GFP_KERNEL);
if (!ses->auth_key.response) { if (!ses->auth_key.response) {
cERROR(1, "Challenge target info allocation failure"); cERROR(1, "Challenge target info allocation failure");
return -ENOMEM; return -ENOMEM;
} }
memcpy(ses->auth_key.response, bcc_ptr + tioffset, tilen);
ses->auth_key.len = tilen; ses->auth_key.len = tilen;
} }
@ -761,14 +761,14 @@ CIFS_SessSetup(const unsigned int xid, struct cifs_ses *ses,
goto ssetup_exit; goto ssetup_exit;
} }
ses->auth_key.response = kmalloc(msg->sesskey_len, GFP_KERNEL); ses->auth_key.response = kmemdup(msg->data, msg->sesskey_len,
GFP_KERNEL);
if (!ses->auth_key.response) { if (!ses->auth_key.response) {
cERROR(1, "Kerberos can't allocate (%u bytes) memory", cERROR(1, "Kerberos can't allocate (%u bytes) memory",
msg->sesskey_len); msg->sesskey_len);
rc = -ENOMEM; rc = -ENOMEM;
goto ssetup_exit; goto ssetup_exit;
} }
memcpy(ses->auth_key.response, msg->data, msg->sesskey_len);
ses->auth_key.len = msg->sesskey_len; ses->auth_key.len = msg->sesskey_len;
pSMB->req.hdr.Flags2 |= SMBFLG2_EXT_SEC; pSMB->req.hdr.Flags2 |= SMBFLG2_EXT_SEC;