p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfrm: make xfrm_replay_state_esn_len() return unsigned int 

Replay detection bitmaps can't have negative length.

Comparisons with nla_len() are left signed just in case negative value
can sneak in there.

Propagate unsignedness for code size savings:

	add/remove: 0/0 grow/shrink: 0/5 up/down: 0/-38 (-38)
	function                                     old     new   delta
	xfrm_state_construct                        1802    1800      -2
	xfrm_update_ae_params                        295     289      -6
	xfrm_state_migrate                          1345    1339      -6
	xfrm_replay_notify_esn                       349     337     -12
	xfrm_replay_notify_bmp                       345     333     -12

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
This commit is contained in:
Alexey Dobriyan 2017-09-21 23:47:50 +03:00 committed by Steffen Klassert
parent 1bd963a72e
commit 5e708e47c4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/xfrm.h
View File

@ -1779,7 +1779,7 @@ static inline unsigned int xfrm_alg_auth_len(const struct xfrm_algo_auth *alg)
return sizeof(*alg) + ((alg->alg_key_len + 7) / 8); return sizeof(*alg) + ((alg->alg_key_len + 7) / 8);
} }
static inline int xfrm_replay_state_esn_len(struct xfrm_replay_state_esn *replay_esn) static inline unsigned int xfrm_replay_state_esn_len(struct xfrm_replay_state_esn *replay_esn)
{ {
return sizeof(*replay_esn) + replay_esn->bmp_len * sizeof(__u32); return sizeof(*replay_esn) + replay_esn->bmp_len * sizeof(__u32);
} }

10
net/xfrm/xfrm_user.c
View File

@ -130,7 +130,7 @@ static inline int verify_replay(struct xfrm_usersa_info *p,
if (rs->bmp_len > XFRMA_REPLAY_ESN_MAX / sizeof(rs->bmp[0]) / 8) if (rs->bmp_len > XFRMA_REPLAY_ESN_MAX / sizeof(rs->bmp[0]) / 8)
return -EINVAL; return -EINVAL;
if (nla_len(rt) < xfrm_replay_state_esn_len(rs) && if (nla_len(rt) < (int)xfrm_replay_state_esn_len(rs) &&
nla_len(rt) != sizeof(*rs)) nla_len(rt) != sizeof(*rs))
return -EINVAL; return -EINVAL;
} }
@ -404,7 +404,7 @@ static inline int xfrm_replay_verify_len(struct xfrm_replay_state_esn *replay_es
struct nlattr *rp) struct nlattr *rp)
{ {
struct xfrm_replay_state_esn *up; struct xfrm_replay_state_esn *up;
int ulen; unsigned int ulen;
if (!replay_esn || !rp) if (!replay_esn || !rp)
return 0; return 0;
@ -414,7 +414,7 @@ static inline int xfrm_replay_verify_len(struct xfrm_replay_state_esn *replay_es
/* Check the overall length and the internal bitmap length to avoid /* Check the overall length and the internal bitmap length to avoid
* potential overflow. */ * potential overflow. */
if (nla_len(rp) < ulen || if (nla_len(rp) < (int)ulen ||
xfrm_replay_state_esn_len(replay_esn) != ulen || xfrm_replay_state_esn_len(replay_esn) != ulen ||
replay_esn->bmp_len != up->bmp_len) replay_esn->bmp_len != up->bmp_len)
return -EINVAL; return -EINVAL;
@ -430,14 +430,14 @@ static int xfrm_alloc_replay_state_esn(struct xfrm_replay_state_esn **replay_esn
struct nlattr *rta) struct nlattr *rta)
{ {
struct xfrm_replay_state_esn *p, *pp, *up; struct xfrm_replay_state_esn *p, *pp, *up;
int klen, ulen; unsigned int klen, ulen;
if (!rta) if (!rta)
return 0; return 0;
up = nla_data(rta); up = nla_data(rta);
klen = xfrm_replay_state_esn_len(up); klen = xfrm_replay_state_esn_len(up);
ulen = nla_len(rta) >= klen ? klen : sizeof(*up); ulen = nla_len(rta) >= (int)klen ? klen : sizeof(*up);
p = kzalloc(klen, GFP_KERNEL); p = kzalloc(klen, GFP_KERNEL);
if (!p) if (!p)