[Devel,RHEL7,COMMIT] ms/xfrm_user: validate XFRM_MSG_NEWAE incoming ESN size harder

Submitted by Konstantin Khorenko on March 30, 2017, 12:14 p.m.

Details

Message ID 201703301214.v2UCEvSW018046@finist_cl7.x64_64.work.ct
State New
Headers show

Patch hide | download patch | download mbox

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 3ee8c69..ec9f399 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -387,7 +387,11 @@  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)