From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kevin Easton <kevin@guarana.org>
Subject: Re: [PATCH net] pppoe: check sockaddr length in pppoe_connect()
Date: Fri, 27 Apr 2018 11:51:31 -0400
Message-ID: <20180427155131.GA22648@la.guarana.org>
References: <387ca48810af36f2626049008a795d1adc375cb8.1524494257.git.g.nault@alphalink.fr>
 <20180427122316.GA20688@la.guarana.org>
 <20180427153906.GF1440@alphalink.fr>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: netdev@vger.kernel.org, Michal Ostrowski <mostrows@earthlink.net>
To: Guillaume Nault <g.nault@alphalink.fr>
Return-path: <netdev-owner@vger.kernel.org>
Received: from la.guarana.org ([173.254.219.205]:42916 "EHLO la.guarana.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S932427AbeD0Pvc (ORCPT <rfc822;netdev@vger.kernel.org>);
        Fri, 27 Apr 2018 11:51:32 -0400
Content-Disposition: inline
In-Reply-To: <20180427153906.GF1440@alphalink.fr>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

On Fri, Apr 27, 2018 at 05:39:06PM +0200, Guillaume Nault wrote:
> On Fri, Apr 27, 2018 at 08:23:16AM -0400, Kevin Easton wrote:
...
> > There's another bug here - pppoe_connect() should also be validating
> > sp->sa_family.  My suggested patch was going to be:
> > 
> > diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
> > index 1483bc7..90eb3fd 100644
> > --- a/drivers/net/ppp/pppoe.c
> > +++ b/drivers/net/ppp/pppoe.c
> > @@ -620,6 +620,14 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr,
> >         lock_sock(sk);
> >  
> >         error = -EINVAL;
> > +       if (sockaddr_len < sizeof(struct sockaddr_pppox))
> > +               goto end;
> > +
> > +       error = -EAFNOSUPPORT;
> > +       if (sp->sa_family != AF_PPPOX)
> > +               goto end;
> > +
> > +       error = -EINVAL;
> >         if (sp->sa_protocol != PX_PROTO_OE)
> >                 goto end;
> >  
> > Should I rework this on top of net.git HEAD?
> > 
> > (The same applies to pppol2tp_connect()).
> > 
> Thanks for the suggestion. But ->sa_family has never been checked.
> Therefore, it has always been possible to connect a PPPoE or L2TP
> socket with an invalid .sa_family field. I'd be surprised if there were
> implementations relying on that, but we never know (for example, an
> implementation could send this field uninitialised). By being stricter
> we'd break such programs. And we don't need this field in the
> connection process, so not checking its value doesn't harm.
> 
> I'm all for being strict and validating user-provided data as much as
> possible, but I'm afraid its too late in this case.

Doesn't the same apply to supplying a bogus sockaddr_len?

I did test the rp-pppoe plugin for pppd with this patch - it does 
correctly set both the sa_family and sockaddr_len.  Checking on
Debian's codesearch also showed that everything in that corpus
that uses PX_PROTO_OE also sets AF_PPPOX.

    - Kevin

>