xfrm_user: validate XFRM_MSG_NEWAE incoming ESN size harder
authorAndy Whitcroft <apw@canonical.com>
Thu, 23 Mar 2017 07:45:44 +0000 (07:45 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Mon, 5 Jun 2017 20:13:53 +0000 (21:13 +0100)
commit4d09fd3505c59374e599a29918ca40059be3d554
tree7f21445675676a9be2c988d8bbee966651e66c11
parent04dba730e9d4798184b4769f74ef14c20f8c6f9a
xfrm_user: validate XFRM_MSG_NEWAE incoming ESN size harder

commit f843ee6dd019bcece3e74e76ad9df0155655d0df upstream.

Kees Cook has pointed out that xfrm_replay_state_esn_len() is subject to
wrapping issues.  To ensure we are correctly ensuring that the two ESN
structures are the same size compare both the overall size as reported
by xfrm_replay_state_esn_len() and the internal length are the same.

CVE-2017-7184
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
net/xfrm/xfrm_user.c