diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 15:48:05 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 15:48:22 +0100 |
| commit | b3bc2cdb1424a78387dde319f1de3622e13d60df (patch) | |
| tree | 193d979316e625250a07aff4c732a6b72b795429 /fs/cifs/cifs_spnego.c | |
| parent | 2c6a140e97ce3bb3cc5c5d637bf1e7dba95b0936 (diff) | |
| parent | a78d278e01b1b608f90077258debc7a98de51482 (diff) | |
Merge tag 'v5.15.140' into fslc-5.15-2.2.x-imx
This is the 5.15.140 stable release
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Conflicts:
arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
drivers/i3c/master/svc-i3c-master.c
Diffstat (limited to 'fs/cifs/cifs_spnego.c')
| -rw-r--r-- | fs/cifs/cifs_spnego.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c index 353bd0dd7026..66b4413b94f7 100644 --- a/fs/cifs/cifs_spnego.c +++ b/fs/cifs/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 |