| Message ID | 577b4601aa5d62d222fa9387c5036f2504f40318.1648017112.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] ksmbd: Remove a redundant zeroing of memory | expand |
2022-03-23 15:32 GMT+09:00, Christophe JAILLET <christophe.jaillet@wanadoo.fr>: > fill_transform_hdr() has only one caller that already clears tr_buf (it is > kzalloc'ed). > > So there is no need to clear it another time here. > > Remove the superfluous memset() and add a comment to remind that the caller > must clear the buffer. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Acked-by: Namjae Jeon <linkinjeon@kernel.org> Thanks!
On Wed, Mar 23, 2022 at 07:32:05AM +0100, Christophe JAILLET wrote: > fill_transform_hdr() has only one caller that already clears tr_buf (it is > kzalloc'ed). > > So there is no need to clear it another time here. > > Remove the superfluous memset() and add a comment to remind that the caller > must clear the buffer. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > v2: keep kzalloc in the caller and remove the memset here I kind of prefered v1. I misread the code and was looking at the wrong fill_transform_hdr() function from the other driver. regards, dan carpenter
diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c index bcb98109bac9..bcd1bb7e2856 100644 --- a/fs/ksmbd/smb2pdu.c +++ b/fs/ksmbd/smb2pdu.c @@ -8410,7 +8410,7 @@ static void fill_transform_hdr(void *tr_buf, char *old_buf, __le16 cipher_type) struct smb2_hdr *hdr = smb2_get_msg(old_buf); unsigned int orig_len = get_rfc1002_len(old_buf); - memset(tr_buf, 0, sizeof(struct smb2_transform_hdr) + 4); + /* tr_buf must be cleared by the caller */ tr_hdr->ProtocolId = SMB2_TRANSFORM_PROTO_NUM; tr_hdr->OriginalMessageSize = cpu_to_le32(orig_len); tr_hdr->Flags = cpu_to_le16(TRANSFORM_FLAG_ENCRYPTED);
fill_transform_hdr() has only one caller that already clears tr_buf (it is kzalloc'ed). So there is no need to clear it another time here. Remove the superfluous memset() and add a comment to remind that the caller must clear the buffer. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- v2: keep kzalloc in the caller and remove the memset here --- fs/ksmbd/smb2pdu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)