* [patch] bridge: make buffer larger in br_setlink()
@ 2012-12-07 6:18 Dan Carpenter
2012-12-07 9:31 ` Thomas Graf
0 siblings, 1 reply; 8+ messages in thread
From: Dan Carpenter @ 2012-12-07 6:18 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev, bridge, kernel-janitors, David S. Miller
__IFLA_BRPORT_MAX is one larger than IFLA_BRPORT_MAX. We pass
IFLA_BRPORT_MAX to nla_parse_nested() so we need IFLA_BRPORT_MAX + 1
elements. Also Smatch complains that we read past the end of the array
when in br_set_port_flag() when it's called with IFLA_BRPORT_FAST_LEAVE.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
Only needed in linux-next.
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 850b7d1..cfc5cfe 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -239,7 +239,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh)
struct ifinfomsg *ifm;
struct nlattr *protinfo;
struct net_bridge_port *p;
- struct nlattr *tb[IFLA_BRPORT_MAX];
+ struct nlattr *tb[__IFLA_BRPORT_MAX];
int err;
ifm = nlmsg_data(nlh);
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [patch] bridge: make buffer larger in br_setlink()
2012-12-07 6:18 [patch] bridge: make buffer larger in br_setlink() Dan Carpenter
@ 2012-12-07 9:31 ` Thomas Graf
2012-12-07 11:10 ` [patch v2] " Dan Carpenter
0 siblings, 1 reply; 8+ messages in thread
From: Thomas Graf @ 2012-12-07 9:31 UTC (permalink / raw)
To: Dan Carpenter
Cc: Stephen Hemminger, David S. Miller, bridge, netdev,
kernel-janitors
On 12/07/12 at 09:18am, Dan Carpenter wrote:
> __IFLA_BRPORT_MAX is one larger than IFLA_BRPORT_MAX. We pass
> IFLA_BRPORT_MAX to nla_parse_nested() so we need IFLA_BRPORT_MAX + 1
> elements. Also Smatch complains that we read past the end of the array
> when in br_set_port_flag() when it's called with IFLA_BRPORT_FAST_LEAVE.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> Only needed in linux-next.
>
> diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
> index 850b7d1..cfc5cfe 100644
> --- a/net/bridge/br_netlink.c
> +++ b/net/bridge/br_netlink.c
> @@ -239,7 +239,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh)
> struct ifinfomsg *ifm;
> struct nlattr *protinfo;
> struct net_bridge_port *p;
> - struct nlattr *tb[IFLA_BRPORT_MAX];
> + struct nlattr *tb[__IFLA_BRPORT_MAX];
> int err;
>
> ifm = nlmsg_data(nlh);
I know it's nitpicking but could you use IFLA_BRPORT_MAX+1 for
consistency?
^ permalink raw reply [flat|nested] 8+ messages in thread
* [patch v2] bridge: make buffer larger in br_setlink()
2012-12-07 9:31 ` Thomas Graf
@ 2012-12-07 11:10 ` Dan Carpenter
2012-12-07 16:07 ` walter harms
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Dan Carpenter @ 2012-12-07 11:10 UTC (permalink / raw)
To: Stephen Hemminger
Cc: Thomas Graf, netdev, bridge, kernel-janitors, David S. Miller
We pass IFLA_BRPORT_MAX to nla_parse_nested() so we need
IFLA_BRPORT_MAX + 1 elements. Also Smatch complains that we read past
the end of the array when in br_set_port_flag() when it's called with
IFLA_BRPORT_FAST_LEAVE.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v2: Style tweak.
Only needed in linux-next.
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 850b7d1..cfc5cfe 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -239,7 +239,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh)
struct ifinfomsg *ifm;
struct nlattr *protinfo;
struct net_bridge_port *p;
- struct nlattr *tb[IFLA_BRPORT_MAX];
+ struct nlattr *tb[IFLA_BRPORT_MAX + 1];
int err;
ifm = nlmsg_data(nlh);
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [patch v2] bridge: make buffer larger in br_setlink()
2012-12-07 11:10 ` [patch v2] " Dan Carpenter
@ 2012-12-07 16:07 ` walter harms
2012-12-07 18:53 ` Dan Carpenter
2012-12-07 17:08 ` Stephen Hemminger
2012-12-07 19:40 ` David Miller
2 siblings, 1 reply; 8+ messages in thread
From: walter harms @ 2012-12-07 16:07 UTC (permalink / raw)
To: Dan Carpenter
Cc: Stephen Hemminger, David S. Miller, bridge, netdev,
kernel-janitors, Thomas Graf
Am 07.12.2012 12:10, schrieb Dan Carpenter:
> We pass IFLA_BRPORT_MAX to nla_parse_nested() so we need
> IFLA_BRPORT_MAX + 1 elements. Also Smatch complains that we read past
> the end of the array when in br_set_port_flag() when it's called with
> IFLA_BRPORT_FAST_LEAVE.
>
I have no clue why nla_parse_nested() need IFLA_BRPORT_MAX elements.
but the majory of loop look like
for(i=0;i<max;++)
most programmers will think this way.
So it seems the place to fix is nla_parse_nested().
doing not so is asking for trouble (in the long run).
At least this function needs a big warning label that (max-1)
is actually needed.
just my two cents,
wh
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> v2: Style tweak.
>
> Only needed in linux-next.
>
> diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
> index 850b7d1..cfc5cfe 100644
> --- a/net/bridge/br_netlink.c
> +++ b/net/bridge/br_netlink.c
> @@ -239,7 +239,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh)
> struct ifinfomsg *ifm;
> struct nlattr *protinfo;
> struct net_bridge_port *p;
> - struct nlattr *tb[IFLA_BRPORT_MAX];
> + struct nlattr *tb[IFLA_BRPORT_MAX + 1];
> int err;
>
> ifm = nlmsg_data(nlh);
>
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch v2] bridge: make buffer larger in br_setlink()
2012-12-07 16:07 ` walter harms
@ 2012-12-07 18:53 ` Dan Carpenter
2012-12-07 19:15 ` walter harms
0 siblings, 1 reply; 8+ messages in thread
From: Dan Carpenter @ 2012-12-07 18:53 UTC (permalink / raw)
To: walter harms
Cc: netdev, bridge, kernel-janitors, Thomas Graf, Stephen Hemminger,
David S. Miller
On Fri, Dec 07, 2012 at 05:07:24PM +0100, walter harms wrote:
>
>
> Am 07.12.2012 12:10, schrieb Dan Carpenter:
> > We pass IFLA_BRPORT_MAX to nla_parse_nested() so we need
> > IFLA_BRPORT_MAX + 1 elements. Also Smatch complains that we read past
> > the end of the array when in br_set_port_flag() when it's called with
> > IFLA_BRPORT_FAST_LEAVE.
> >
>
>
>
> I have no clue why nla_parse_nested() need IFLA_BRPORT_MAX elements.
> but the majory of loop look like
> for(i=0;i<max;++)
> most programmers will think this way.
> So it seems the place to fix is nla_parse_nested().
> doing not so is asking for trouble (in the long run).
> At least this function needs a big warning label that (max-1)
> is actually needed.
>
Yeah, nla_parse_nested() is actually documented already.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch v2] bridge: make buffer larger in br_setlink()
2012-12-07 18:53 ` Dan Carpenter
@ 2012-12-07 19:15 ` walter harms
0 siblings, 0 replies; 8+ messages in thread
From: walter harms @ 2012-12-07 19:15 UTC (permalink / raw)
To: Dan Carpenter
Cc: Stephen Hemminger, David S. Miller, bridge, netdev,
kernel-janitors, Thomas Graf
Am 07.12.2012 19:53, schrieb Dan Carpenter:
> On Fri, Dec 07, 2012 at 05:07:24PM +0100, walter harms wrote:
>>
>>
>> Am 07.12.2012 12:10, schrieb Dan Carpenter:
>>> We pass IFLA_BRPORT_MAX to nla_parse_nested() so we need
>>> IFLA_BRPORT_MAX + 1 elements. Also Smatch complains that we read past
>>> the end of the array when in br_set_port_flag() when it's called with
>>> IFLA_BRPORT_FAST_LEAVE.
>>>
>>
>>
>>
>> I have no clue why nla_parse_nested() need IFLA_BRPORT_MAX elements.
>> but the majory of loop look like
>> for(i=0;i<max;++)
>> most programmers will think this way.
>> So it seems the place to fix is nla_parse_nested().
>> doing not so is asking for trouble (in the long run).
>> At least this function needs a big warning label that (max-1)
>> is actually needed.
>>
>
> Yeah, nla_parse_nested() is actually documented already.
>
documenting unexspected behavier is not as much helpfull as changing it.
just my 2 cents,
wh
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch v2] bridge: make buffer larger in br_setlink()
2012-12-07 11:10 ` [patch v2] " Dan Carpenter
2012-12-07 16:07 ` walter harms
@ 2012-12-07 17:08 ` Stephen Hemminger
2012-12-07 19:40 ` David Miller
2 siblings, 0 replies; 8+ messages in thread
From: Stephen Hemminger @ 2012-12-07 17:08 UTC (permalink / raw)
To: Dan Carpenter
Cc: Thomas Graf, netdev, bridge, kernel-janitors, David S. Miller
----- Original Message -----
> We pass IFLA_BRPORT_MAX to nla_parse_nested() so we need
> IFLA_BRPORT_MAX + 1 elements. Also Smatch complains that we read
> past
> the end of the array when in br_set_port_flag() when it's called with
> IFLA_BRPORT_FAST_LEAVE.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> v2: Style tweak.
>
> Only needed in linux-next.
>
> diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
> index 850b7d1..cfc5cfe 100644
> --- a/net/bridge/br_netlink.c
> +++ b/net/bridge/br_netlink.c
> @@ -239,7 +239,7 @@ int br_setlink(struct net_device *dev, struct
> nlmsghdr *nlh)
> struct ifinfomsg *ifm;
> struct nlattr *protinfo;
> struct net_bridge_port *p;
> - struct nlattr *tb[IFLA_BRPORT_MAX];
> + struct nlattr *tb[IFLA_BRPORT_MAX + 1];
> int err;
>
> ifm = nlmsg_data(nlh);
>
>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch v2] bridge: make buffer larger in br_setlink()
2012-12-07 11:10 ` [patch v2] " Dan Carpenter
2012-12-07 16:07 ` walter harms
2012-12-07 17:08 ` Stephen Hemminger
@ 2012-12-07 19:40 ` David Miller
2 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2012-12-07 19:40 UTC (permalink / raw)
To: dan.carpenter; +Cc: tgraf, netdev, shemminger, bridge, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 7 Dec 2012 14:10:46 +0300
> We pass IFLA_BRPORT_MAX to nla_parse_nested() so we need
> IFLA_BRPORT_MAX + 1 elements. Also Smatch complains that we read past
> the end of the array when in br_set_port_flag() when it's called with
> IFLA_BRPORT_FAST_LEAVE.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-12-07 19:40 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-07 6:18 [patch] bridge: make buffer larger in br_setlink() Dan Carpenter
2012-12-07 9:31 ` Thomas Graf
2012-12-07 11:10 ` [patch v2] " Dan Carpenter
2012-12-07 16:07 ` walter harms
2012-12-07 18:53 ` Dan Carpenter
2012-12-07 19:15 ` walter harms
2012-12-07 17:08 ` Stephen Hemminger
2012-12-07 19:40 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).