From: Dan Carpenter <dan.carpenter@oracle.com>
To: walter harms <wharms@bfs.de>
Cc: "David S. Miller" <davem@davemloft.net>,
Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
James Morris <jmorris@namei.org>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Patrick McHardy <kaber@trash.net>,
netdev@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [patch] ip6mr: limit IPv6 MRT_TABLE identifiers
Date: Thu, 24 Jan 2013 09:01:01 +0000 [thread overview]
Message-ID: <20130124090101.GC4584@mwanda> (raw)
In-Reply-To: <5100EF60.1080409@bfs.de>
On Thu, Jan 24, 2013 at 09:22:56AM +0100, walter harms wrote:
>
>
> Am 24.01.2013 07:38, schrieb Dan Carpenter:
> > We did this for IPv4 in b49d3c1e1c "net: ipmr: limit MRT_TABLE
> > identifiers" but we need to do it for IPv6 as well. On IPv6 the name
> > is "pim6reg" instead of "pimreg" so there is one less digit allowed.
> >
> > The strcpy() is in ip6mr_reg_vif().
> >
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> >
> > diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
> > index acc3249..351ce98 100644
> > --- a/net/ipv6/ip6mr.c
> > +++ b/net/ipv6/ip6mr.c
> > @@ -1766,6 +1766,9 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns
> > return -EINVAL;
> > if (get_user(v, (u32 __user *)optval))
> > return -EFAULT;
> > + /* "pim6reg%u" should not exceed 16 bytes (IFNAMSIZ) */
> > + if (v != RT_TABLE_DEFAULT && v >= 100000000)
> > + return -EINVAL;
> > if (sk = mrt->mroute6_sk)
> > return -EBUSY;
> >
> hi Dan,
> that comment left me in a bit confused, i guess you men
> printf( "pim6reg%u",v) should not exceed IFNAMSIZ (16 bytes) ?
Yes.
> also the if is a bit strange, i assume that RT_TABLE_DEFAULT is const
> so anything else is rejected than v=RT_TABLE_DEFAULT
> (assuming that RT_TABLE_DEFAULT >= 100000000 ....)
I don't understand what you are saying.
The patch is basically copy and pasted from b49d3c1e1c "net: ipmr:
limit MRT_TABLE identifiers". RT6_TABLE_DFLT is allowed to be a
high number because in ip6mr_reg_vif() we do:
if (mrt->id = RT6_TABLE_DFLT)
sprintf(name, "pim6reg");
else
sprintf(name, "pim6reg%u", mrt->id);
regards,
dan carpenter
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: walter harms <wharms@bfs.de>
Cc: "David S. Miller" <davem@davemloft.net>,
Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
James Morris <jmorris@namei.org>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Patrick McHardy <kaber@trash.net>,
netdev@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [patch] ip6mr: limit IPv6 MRT_TABLE identifiers
Date: Thu, 24 Jan 2013 12:01:01 +0300 [thread overview]
Message-ID: <20130124090101.GC4584@mwanda> (raw)
In-Reply-To: <5100EF60.1080409@bfs.de>
On Thu, Jan 24, 2013 at 09:22:56AM +0100, walter harms wrote:
>
>
> Am 24.01.2013 07:38, schrieb Dan Carpenter:
> > We did this for IPv4 in b49d3c1e1c "net: ipmr: limit MRT_TABLE
> > identifiers" but we need to do it for IPv6 as well. On IPv6 the name
> > is "pim6reg" instead of "pimreg" so there is one less digit allowed.
> >
> > The strcpy() is in ip6mr_reg_vif().
> >
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> >
> > diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
> > index acc3249..351ce98 100644
> > --- a/net/ipv6/ip6mr.c
> > +++ b/net/ipv6/ip6mr.c
> > @@ -1766,6 +1766,9 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns
> > return -EINVAL;
> > if (get_user(v, (u32 __user *)optval))
> > return -EFAULT;
> > + /* "pim6reg%u" should not exceed 16 bytes (IFNAMSIZ) */
> > + if (v != RT_TABLE_DEFAULT && v >= 100000000)
> > + return -EINVAL;
> > if (sk == mrt->mroute6_sk)
> > return -EBUSY;
> >
> hi Dan,
> that comment left me in a bit confused, i guess you men
> printf( "pim6reg%u",v) should not exceed IFNAMSIZ (16 bytes) ?
Yes.
> also the if is a bit strange, i assume that RT_TABLE_DEFAULT is const
> so anything else is rejected than v==RT_TABLE_DEFAULT
> (assuming that RT_TABLE_DEFAULT >= 100000000 ....)
I don't understand what you are saying.
The patch is basically copy and pasted from b49d3c1e1c "net: ipmr:
limit MRT_TABLE identifiers". RT6_TABLE_DFLT is allowed to be a
high number because in ip6mr_reg_vif() we do:
if (mrt->id == RT6_TABLE_DFLT)
sprintf(name, "pim6reg");
else
sprintf(name, "pim6reg%u", mrt->id);
regards,
dan carpenter
next prev parent reply other threads:[~2013-01-24 9:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-24 6:38 [patch] ip6mr: limit IPv6 MRT_TABLE identifiers Dan Carpenter
2013-01-24 6:38 ` Dan Carpenter
2013-01-24 8:22 ` walter harms
2013-01-24 8:22 ` walter harms
2013-01-24 9:01 ` Dan Carpenter [this message]
2013-01-24 9:01 ` Dan Carpenter
2013-01-28 0:31 ` David Miller
2013-01-28 0:31 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130124090101.GC4584@mwanda \
--to=dan.carpenter@oracle.com \
--cc=davem@davemloft.net \
--cc=jmorris@namei.org \
--cc=kaber@trash.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=kuznet@ms2.inr.ac.ru \
--cc=netdev@vger.kernel.org \
--cc=wharms@bfs.de \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.