cifs: spnego: add ';' in HOST_KEY_LEN

[PATCH] cifs: spnego: add ';' in HOST_KEY_LEN

Posted by Anastasia Belova 2 years, 1 month ago

"host=" should start with ';' (as in cifs_get_spnego_key)
So its length should be 6.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 7c9c3760b3a5 ("[CIFS] add constants for string lengths of keynames in SPNEGO upcall string")
Signed-off-by: Anastasia Belova <abelova@astralinux.ru>
Co-developed-by: Ekaterina Esina <eesina@astralinux.ru>
Signed-off-by: Ekaterina Esina <eesina@astralinux.ru>
---
 fs/smb/client/cifs_spnego.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/smb/client/cifs_spnego.c b/fs/smb/client/cifs_spnego.c
index 6f3285f1dfee..af7849e5974f 100644
--- a/fs/smb/client/cifs_spnego.c
+++ b/fs/smb/client/cifs_spnego.c
@@ -64,8 +64,8 @@ struct key_type cifs_spnego_key_type = {
  * strlen(";sec=ntlmsspi") */
 #define MAX_MECH_STR_LEN	13
 
-/* strlen of "host=" */
-#define HOST_KEY_LEN		5
+/* strlen of ";host=" */
+#define HOST_KEY_LEN		6
 
 /* strlen of ";ip4=" or ";ip6=" */
 #define IP_KEY_LEN		5
-- 
2.30.2

Re: [PATCH] cifs: spnego: add ';' in HOST_KEY_LEN

Posted by Paulo Alcantara 2 years, 1 month ago

Anastasia Belova <abelova@astralinux.ru> writes:

> "host=" should start with ';' (as in cifs_get_spnego_key)
> So its length should be 6.
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>
> Fixes: 7c9c3760b3a5 ("[CIFS] add constants for string lengths of keynames in SPNEGO upcall string")
> Signed-off-by: Anastasia Belova <abelova@astralinux.ru>
> Co-developed-by: Ekaterina Esina <eesina@astralinux.ru>
> Signed-off-by: Ekaterina Esina <eesina@astralinux.ru>
> ---
>  fs/smb/client/cifs_spnego.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Paulo Alcantara (SUSE) <pc@manguebit.com>

Re: [PATCH] cifs: spnego: add ';' in HOST_KEY_LEN

Posted by Steve French 2 years, 1 month ago

Tentatively merged into cifs-2.6.git for-next pending testing

On Mon, Nov 13, 2023 at 12:11 PM Paulo Alcantara <pc@manguebit.com> wrote:
>
> Anastasia Belova <abelova@astralinux.ru> writes:
>
> > "host=" should start with ';' (as in cifs_get_spnego_key)
> > So its length should be 6.
> >
> > Found by Linux Verification Center (linuxtesting.org) with SVACE.
> >
> > Fixes: 7c9c3760b3a5 ("[CIFS] add constants for string lengths of keynames in SPNEGO upcall string")
> > Signed-off-by: Anastasia Belova <abelova@astralinux.ru>
> > Co-developed-by: Ekaterina Esina <eesina@astralinux.ru>
> > Signed-off-by: Ekaterina Esina <eesina@astralinux.ru>
> > ---
> >  fs/smb/client/cifs_spnego.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
>
> Reviewed-by: Paulo Alcantara (SUSE) <pc@manguebit.com>
>


-- 
Thanks,

Steve