Thread (74 messages) 74 messages, 24 authors, 2015-09-24

Re: [PATCH 20/31] fs/cifs: use kmemdup rather than duplicating its implementation

From: Steve French <smfrench@gmail.com>
Date: 2015-09-17 05:00:40
Also in: linux-cifs

loooks reasonable to me - isn't this part of a larger patch series
though? Did you want it merged distinctly into cifs-2.6.git?

On Fri, Aug 7, 2015 at 2:59 AM, Andrzej Hajda [off-list ref] wrote:
quoted hunk ↗ jump to hunk
The patch was generated using fixed coccinelle semantic patch
scripts/coccinelle/api/memdup.cocci [1].

[1]: http://permalink.gmane.org/gmane.linux.kernel/2014320

Signed-off-by: Andrzej Hajda <redacted>
---
 fs/cifs/smb2pdu.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 070fb2a..2d6b72f 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -1394,14 +1394,13 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
                goto ioctl_exit;
        }

-       *out_data = kmalloc(*plen, GFP_KERNEL);
+       *out_data = kmemdup(rsp->hdr.ProtocolId + le32_to_cpu(rsp->OutputOffset),
+                           *plen, GFP_KERNEL);
        if (*out_data == NULL) {
                rc = -ENOMEM;
                goto ioctl_exit;
        }

-       memcpy(*out_data, rsp->hdr.ProtocolId + le32_to_cpu(rsp->OutputOffset),
-              *plen);
 ioctl_exit:
        free_rsp_buf(resp_buftype, rsp);
        return rc;
--
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


-- 
Thanks,

Steve
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help