netdev - Re: [PATCH net] ipv6: addrconf: validate new MTU before applying it

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:	Sun, 22 Feb 2015 00:40:08 -0300
From:	Marcelo Ricardo Leitner <mleitner@...hat.com>
To:	Sabrina Dubroca <sd@...asysnail.net>
Cc:	netdev@...r.kernel.org
Subject: Re: [PATCH net] ipv6: addrconf: validate new MTU before applying it

On Sat, Feb 21, 2015 at 04:54:07PM +0100, Sabrina Dubroca wrote:
> Hi,
> 
> 2015-02-20, 16:24:06 -0200, Marcelo Ricardo Leitner wrote:
> 
> > [...]
> 
> > ---
> >  net/ipv6/addrconf.c | 32 +++++++++++++++++++++++++++++++-
> >  1 file changed, 31 insertions(+), 1 deletion(-)
> > 
> > diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
> > index f7c8bbeb27b704c0106f714d5a0677c27d3346e0..38892228ccacfe8b67b182784723cc0b67ce572b 100644
> > --- a/net/ipv6/addrconf.c
> > +++ b/net/ipv6/addrconf.c
> > @@ -4863,6 +4863,36 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
> >  	return ret;
> >  }
> >  
> > +static
> > +int addrconf_sysctl_mtu(struct ctl_table *ctl, int write,
> > +			void __user *buffer, size_t *lenp, loff_t *ppos)
> > +{
> > +	int *valp = ctl->data;
> > +	int val = *valp;
> > +	loff_t pos = *ppos;
> > +	struct ctl_table lctl;
> > +	int ret;
> > +
> > +	/* ctl->data points to idev->cnf.mtu6
> > +	 */
> > +	lctl = *ctl;
> > +	lctl.data = &val;
> > +
> > +	ret = proc_dointvec(&lctl, write, buffer, lenp, ppos);
> > +
> > +	if (write) {
> > +		struct inet6_dev *idev = ctl->extra1;
> > +
> > +		if (val >= IPV6_MIN_MTU && val <= idev->dev->mtu)
> 
> "all" and "default" don't have an idev, so you need a check here:
> 
>     if (val >= IPV6_MIN_MTU && (!idev || val <= idev->dev->mtu))

Oh, indeed.

> > +			*valp = val;
> > +		else
> > +			ret = -EINVAL;
> > +	}
> > +	if (ret)
> > +		*ppos = pos;
> > +	return ret;
> > +}
> > +
> 
> 
> You could call proc_dointvec_minmax to do the checks.  Something like:
> 
> static
> int addrconf_sysctl_mtu(struct ctl_table *ctl, int write,
> 			void __user *buffer, size_t *lenp, loff_t *ppos)
> {
> 	struct inet6_dev *idev = ctl->extra1;
> 	int min_mtu = IPV6_MIN_MTU;
> 	struct ctl_table lctl;
> 
> 	lctl = *ctl;
> 	lctl.extra1 = &min_mtu;
> 	lctl.extra2 = idev ? &idev->dev->mtu : NULL;
> 
> 	return proc_dointvec_minmax(&lctl, write, buffer, lenp, ppos);
> }

That's much better! Weird that I did look for a _minmax helper and
missed it :/
Thanks Sabrina, I'll send a v2 soon.

  Marcelo
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html