Merge "xfrm_user: validate XFRM_MSG_NEWAE incoming ESN size harder" (0b048487) · Commits · e / devices / android_kernel_xiaomi_markw

net/xfrm/xfrm_user.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -386,7 +386,15 @@ static inline int xfrm_replay_verify_len(struct xfrm_replay_state_esn *replay_es
		up = nla_data(rp);
		ulen = xfrm_replay_state_esn_len(up);

		if (nla_len(rp) < ulen \|\| xfrm_replay_state_esn_len(replay_esn) != ulen)
		/* Check the overall length and the internal bitmap length to avoid
		* potential overflow.
		*/
		if (nla_len(rp) < ulen \|\|
		xfrm_replay_state_esn_len(replay_esn) != ulen \|\|
		replay_esn->bmp_len != up->bmp_len)
		return -EINVAL;

		if (up->replay_window > up->bmp_len * sizeof(__u32) * 8)
		return -EINVAL;

		return 0;