Re: [PATCH] apparmor: Fix logical error in verify_header()

[John Johansen <john.johansen@canonical.com>]

On 07/08/2017 12:50 PM, Christos Gkekas wrote:
> verify_header() is currently checking whether interface version is less
> than 5 *and* greater than 7, which always evaluates to false. Instead it
> should check whether it is less than 5 *or* greater than 7.
> 
> Signed-off-by: Christos Gkekas <chris.gekas@gmail.com>

sigh, yes. sorry for the delay this ended up in the wrong bucket.

I've pulled it in for the next pull

Acked-by: John Johansen <john.johansen@canonical.com>


> ---
>  security/apparmor/policy_unpack.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
> index c600f4d..f273c61 100644
> --- a/security/apparmor/policy_unpack.c
> +++ b/security/apparmor/policy_unpack.c
> @@ -832,7 +832,7 @@ static int verify_header(struct aa_ext *e, int required, const char **ns)
>  	 * if not specified use previous version
>  	 * Mask off everything that is not kernel abi version
>  	 */
> -	if (VERSION_LT(e->version, v5) && VERSION_GT(e->version, v7)) {
> +	if (VERSION_LT(e->version, v5) || VERSION_GT(e->version, v7)) {
>  		audit_iface(NULL, NULL, NULL, "unsupported interface version",
>  			    e, error);
>  		return error;
>