| Message ID | 20221004062333.416225-2-usama.anjum@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] cifs: remove initialization value | expand |
Muhammad Usama Anjum <usama.anjum@collabora.com> writes: > smb311_decode_neg_context() can return error. Its return value should be > checked for errors. > > Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> > --- > fs/cifs/smb2pdu.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c > index 2bf43c892ae6..c6e37352dbe1 100644 This patch doesn't apply in Steve's for-next branch[1]. If it still makes sense, please rebase and resend. [1] git://git.samba.org/sfrench/cifs-2.6.git
On 10/5/22 12:01 AM, Paulo Alcantara wrote: > Muhammad Usama Anjum <usama.anjum@collabora.com> writes: > >> smb311_decode_neg_context() can return error. Its return value should be >> checked for errors. >> >> Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> >> --- >> fs/cifs/smb2pdu.c | 7 +++++-- >> 1 file changed, 5 insertions(+), 2 deletions(-) >> >> diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c >> index 2bf43c892ae6..c6e37352dbe1 100644 > > This patch doesn't apply in Steve's for-next branch[1]. If it still > makes sense, please rebase and resend. > > [1] git://git.samba.org/sfrench/cifs-2.6.git I've just applied on the latest next next-20221004 tag. This patch doesn't apply. It seems some other patch has merged and this patch isn't needed. Can you apply only the first patch "[PATCH 1/2] cifs: remove initialization value" from this series? Or should I send that only as v2?
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 2bf43c892ae6..c6e37352dbe1 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -1089,11 +1089,14 @@ SMB2_negotiate(const unsigned int xid, server->signing_algorithm = SIGNING_ALG_AES_CMAC; server->signing_negotiated = false; - if (rsp->NegotiateContextCount) + if (rsp->NegotiateContextCount) { rc = smb311_decode_neg_context(rsp, server, rsp_iov.iov_len); - else + if (rc) + goto neg_exit; + } else { cifs_server_dbg(VFS, "Missing expected negotiate contexts\n"); + } /* * Some servers will not send a SMB2_SIGNING_CAPABILITIES context response (*),
smb311_decode_neg_context() can return error. Its return value should be checked for errors. Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> --- fs/cifs/smb2pdu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)