[PATCH] cifs: fix MUST SecurityFlags filtering

[Steve French]

merged into cifs-2.6.git

On Thu, Jan 22, 2015 at 7:16 AM, Niklas Cassel <niklas.cassel at axis.com> wrote:
> If CONFIG_CIFS_WEAK_PW_HASH is not set, CIFSSEC_MUST_LANMAN
> and CIFSSEC_MUST_PLNTXT is defined as 0.
>
> When setting new SecurityFlags without any MUST flags,
> your flags would be overwritten with CIFSSEC_MUST_LANMAN (0).
>
> Signed-off-by: Niklas Cassel <niklass at axis.com>
> ---
>  fs/cifs/cifs_debug.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
> index 9c56ef7..7febcf2 100644
> --- a/fs/cifs/cifs_debug.c
> +++ b/fs/cifs/cifs_debug.c
> @@ -606,9 +606,11 @@ cifs_security_flags_handle_must_flags(unsigned int *flags)
>                 *flags = CIFSSEC_MUST_NTLMV2;
>         else if ((*flags & CIFSSEC_MUST_NTLM) == CIFSSEC_MUST_NTLM)
>                 *flags = CIFSSEC_MUST_NTLM;
> -       else if ((*flags & CIFSSEC_MUST_LANMAN) == CIFSSEC_MUST_LANMAN)
> +       else if (CIFSSEC_MUST_LANMAN &&
> +                (*flags & CIFSSEC_MUST_LANMAN) == CIFSSEC_MUST_LANMAN)
>                 *flags = CIFSSEC_MUST_LANMAN;
> -       else if ((*flags & CIFSSEC_MUST_PLNTXT) == CIFSSEC_MUST_PLNTXT)
> +       else if (CIFSSEC_MUST_PLNTXT &&
> +                (*flags & CIFSSEC_MUST_PLNTXT) == CIFSSEC_MUST_PLNTXT)
>                 *flags = CIFSSEC_MUST_PLNTXT;
>
>         *flags |= signflags;
> --
> 2.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



-- 
Thanks,

Steve