tree 3888fddd6dbaeb7a960d9c776181ee276ea40e72
parent 72c33734b5fa8a788734ad2312a89b944589c5a0
parent f843ee6dd019bcece3e74e76ad9df0155655d0df
author Linus Torvalds <torvalds@linux-foundation.org> 1490819182 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1490819182 -0700

Merge branch 'apw' (xfrm_user fixes)

Merge xfrm_user validation fixes from Andy Whitcroft:
 "Two patches we are applying to Ubuntu for XFRM_MSG_NEWAE validation
  issue reported by ZDI.

  The first of these is the primary fix, and the second is for a more
  theoretical issue that Kees pointed out when reviewing the first"

* emailed patches from Andy Whitcroft <apw@canonical.com>:
  xfrm_user: validate XFRM_MSG_NEWAE incoming ESN size harder
  xfrm_user: validate XFRM_MSG_NEWAE XFRMA_REPLAY_ESN_VAL replay_window