linux-kernel - RE: selftests: net: l2tp.sh regression starting with 6.1-rc1

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Thu, 30 Mar 2023 10:12:20 +0000
From:   "Drewek, Wojciech" <wojciech.drewek@...el.com>
To:     Andrea Righi <andrea.righi@...onical.com>
CC:     Guillaume Nault <gnault@...hat.com>,
        "David S. Miller" <davem@...emloft.net>,
        Eric Dumazet <edumazet@...gle.com>,
        Jakub Kicinski <kuba@...nel.org>,
        Paolo Abeni <pabeni@...hat.com>, Shuah Khan <shuah@...nel.org>,
        "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
        "linux-kselftest@...r.kernel.org" <linux-kselftest@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: selftests: net: l2tp.sh regression starting with 6.1-rc1



> -----Original Message-----
> From: Andrea Righi <andrea.righi@...onical.com>
> Sent: czwartek, 30 marca 2023 11:56
> To: Drewek, Wojciech <wojciech.drewek@...el.com>
> Cc: Guillaume Nault <gnault@...hat.com>; David S. Miller <davem@...emloft.net>; Eric Dumazet <edumazet@...gle.com>; Jakub
> Kicinski <kuba@...nel.org>; Paolo Abeni <pabeni@...hat.com>; Shuah Khan <shuah@...nel.org>; netdev@...r.kernel.org; linux-
> kselftest@...r.kernel.org; linux-kernel@...r.kernel.org
> Subject: Re: selftests: net: l2tp.sh regression starting with 6.1-rc1
> 
> On Thu, Mar 30, 2023 at 09:26:06AM +0000, Drewek, Wojciech wrote:
> >
> >
> > > -----Original Message-----
> > > From: Andrea Righi <andrea.righi@...onical.com>
> > > Sent: czwartek, 30 marca 2023 08:45
> > > To: Guillaume Nault <gnault@...hat.com>
> > > Cc: Drewek, Wojciech <wojciech.drewek@...el.com>; David S. Miller <davem@...emloft.net>; Eric Dumazet
> > > <edumazet@...gle.com>; Jakub Kicinski <kuba@...nel.org>; Paolo Abeni <pabeni@...hat.com>; Shuah Khan
> <shuah@...nel.org>;
> > > netdev@...r.kernel.org; linux-kselftest@...r.kernel.org; linux-kernel@...r.kernel.org
> > > Subject: Re: selftests: net: l2tp.sh regression starting with 6.1-rc1
> > >
> > > On Wed, Mar 29, 2023 at 06:52:20PM +0200, Guillaume Nault wrote:
> > > > On Wed, Mar 29, 2023 at 03:39:13PM +0000, Drewek, Wojciech wrote:
> > > > >
> > > > >
> > > > > > -----Original Message-----
> > > > > > -MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET6, 2, IPPROTO_L2TP);
> > > > > > -MODULE_ALIAS_NET_PF_PROTO(PF_INET6, IPPROTO_L2TP);
> > > > > > +MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET6, 2, 115 /* IPPROTO_L2TP */);
> > > > > > +MODULE_ALIAS_NET_PF_PROTO(PF_INET6, 115 /* IPPROTO_L2TP */);
> > > > >
> > > > > Btw, am I blind or the alias with type was wrong the whole time?
> > > > > pf goes first, then proto and type at the end according to the definition of MODULE_ALIAS_NET_PF_PROTO_TYPE
> > > > > and here type (2) is 2nd and proto (115) is 3rd
> > > >
> > > > You're not blind :). The MODULE_ALIAS_NET_PF_PROTO_TYPE(...) is indeed
> > > > wrong. Auto-loading the l2tp_ip and l2tp_ip6 modules only worked
> > > > because of the extra MODULE_ALIAS_NET_PF_PROTO() declaration (as
> > > > inet_create() and inet6_create() fallback to "net-pf-%d-proto-%d" if
> > > > "net-pf-%d-proto-%d-type-%d" fails).
> > >
> > > At this point I think using 115 directly is probably the best solution,
> > > that is also what we do already with SOCK_DGRAM, but I would just update
> > > the comment up above, instead of adding the inline comments.
> >
> > Agree,
> >
> > I verified the fix on my machine,
> > Do you want me to send the patch or you'll just send below one?
> 
> Sent already. :)
> 
> -Andrea

Thank you!