On Thu, Apr 13, 2017 at 06:35:59PM +0800, Herbert Xu wrote:
> On Wed, Apr 12, 2017 at 05:39:22PM -0700, Cong Wang wrote:
> > On Wed, Apr 12, 2017 at 8:02 AM, Andrey Konovalov <andreyk...@google.com>
> > wrote:
> > > Hi,
> > >
> > > I've got the following error report while fuzzing the kernel with
> > > syzkaller.
> > >
> > > On commit 39da7c509acff13fc8cb12ec1bb20337c988ed36 (4.11-rc6).
> > >
> > > A reproducer and .config are attached.
> > >
> > > When subtracting rq->sadb_x_ipsecrequest_len from len it can become
> > > negative and the while loop condition remains true.
> >
> > Good catch! Seems the fix is pretty straight forward:
> >
> > diff --git a/net/key/af_key.c b/net/key/af_key.c
> > index c6252ed..cbce595 100644
> > --- a/net/key/af_key.c
> > +++ b/net/key/af_key.c
> > @@ -1945,7 +1945,7 @@ parse_ipsecrequests(struct xfrm_policy *xp,
> > struct sadb_x_policy *pol)
> > if (pol->sadb_x_policy_len * 8 < sizeof(struct sadb_x_policy))
> > return -EINVAL;
> >
> > - while (len >= sizeof(struct sadb_x_ipsecrequest)) {
> > + while (len >= (int)sizeof(struct sadb_x_ipsecrequest)) {
> > if ((err = parse_ipsecrequest(xp, rq)) < 0)
> > return err;
> > len -= rq->sadb_x_ipsecrequest_len;
> >
> > But pol->sadb_x_policy_len and rq->sadb_x_ipsecrequest_len
> > are controllable by user (fortunately root), I am feeling there might
> > be other problem I miss too.
>
> Well the fact that it is negative means that you've already parsed
> crap in the previous loop. This interface really needs to die.
Do you see a chance to remove this? I guess it is not used frequently
anymore, but distros still ship the old ipsec tools.
>
> ---8<---
> Subject: af_key: Fix sadb_x_ipsecrequest parsing
>
> The parsing of sadb_x_ipsecrequest is broken in a number of ways.
> First of all we're not verifying sadb_x_ipsecrequest_len. This
> is needed when the structure carries addresses at the end. Worse
> we don't even look at the length when we parse those optional
> addresses.
>
> The migration code had similar parsing code that's better but
> it also has some deficiencies. The length is overcounted first
> of all as it includes the header itself. It also fails to check
> the length before dereferencing the sa_family field.
>
> This patch fixes those problems in parse_sockaddr_pair and then
> uses it in parse_ipsecrequest.
>
> Reported-by: Andrey Konovalov <andreyk...@google.com>
> Signed-off-by: Herbert Xu <herb...@gondor.apana.org.au>
Applied to the ipsec tree, thanks Herbert!
