Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bd963a7 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Steffen Klassert
Browse files

xfrm: make xfrm_alg_auth_len() return unsigned int 



Key lengths can't be negative.

Comparison with nla_len() is left signed just in case negative value
can sneak in there.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 06cd22f8

include/net/xfrm.h

+1 −1
Original line number Diff line number Diff line
@@ -1774,7 +1774,7 @@ static inline unsigned int xfrm_alg_len(const struct xfrm_algo *alg) 
	return sizeof(*alg) + ((alg->alg_key_len + 7) / 8);

}



static inline int xfrm_alg_auth_len(const struct xfrm_algo_auth *alg)

static inline unsigned int xfrm_alg_auth_len(const struct xfrm_algo_auth *alg)

{

	return sizeof(*alg) + ((alg->alg_key_len + 7) / 8);

}

net/xfrm/xfrm_user.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static int verify_auth_trunc(struct nlattr **attrs) 
		return 0;



	algp = nla_data(rt);

	if (nla_len(rt) < xfrm_alg_auth_len(algp))

	if (nla_len(rt) < (int)xfrm_alg_auth_len(algp))

		return -EINVAL;



	algp->alg_name[sizeof(algp->alg_name) - 1] = '\0';