From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Pirko Subject: Re: [patch net] team: loadbalance: push lacpdus to exact delivery Date: Fri, 26 Aug 2016 08:12:37 +0200 Message-ID: <20160826061237.GA1793@nanopsycho.orion> References: <1472142214-14787-1-git-send-email-jiri@resnulli.us> <20160825164622.GE1880@nanopsycho.orion> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-netdev , David Miller , idosch@mellanox.com, eladr@mellanox.com, yotamg@mellanox.com To: Mahesh Bandewar =?utf-8?B?KOCkruCkueClh+CktiDgpKzgpILgpKHgpYfgpLXgpL4=?= =?utf-8?B?4KSwKQ==?= Return-path: Received: from mail-wm0-f67.google.com ([74.125.82.67]:32886 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750970AbcHZGNt (ORCPT ); Fri, 26 Aug 2016 02:13:49 -0400 Received: by mail-wm0-f67.google.com with SMTP id o80so10047877wme.0 for ; Thu, 25 Aug 2016 23:12:40 -0700 (PDT) Content-Disposition: inline In-Reply-To: Sender: netdev-owner@vger.kernel.org List-ID: Thu, Aug 25, 2016 at 07:35:27PM CEST, maheshb@google.com wrote: >On Thu, Aug 25, 2016 at 9:46 AM, Jiri Pirko wrote: >> Thu, Aug 25, 2016 at 06:37:35PM CEST, maheshb@google.com wrote: >>>On Thu, Aug 25, 2016 at 9:23 AM, Jiri Pirko wrote: >>>> From: Jiri Pirko >>>> >>>> When team is in bridge and LACP is utilized, LACPDU packets are pushed >>>> to userspace using raw socket and there they are processed. However, >>>> since 8626c56c8279b, LACPDU skbs are dropped by bridge rx_handler so >>>> they never reach packet handlers in rx path. Fix this by explicity treat >>>> LACPDUs to be pushed to exact delivery in team rx_handler. >>>> >>>> Reported-by: Ido Schimmel >>>> Fixes: 8626c56c8279b ("bridge: fix potential use-after-free when hook returns QUEUE or STOLEN verdict") >>>> Signed-off-by: Jiri Pirko >>>> --- >>>> drivers/net/team/team_mode_loadbalance.c | 14 ++++++++++++++ >>>> 1 file changed, 14 insertions(+) >>>> >>>> diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c >>>> index cdb19b3..e7c8210 100644 >>>> --- a/drivers/net/team/team_mode_loadbalance.c >>>> +++ b/drivers/net/team/team_mode_loadbalance.c >>>> @@ -17,6 +17,19 @@ >>>> #include >>>> #include >>>> >>>> +static rx_handler_result_t lb_receive(struct team *team, struct team_port *port, >>>> + struct sk_buff *skb) >>>> +{ >>>> + if (unlikely(skb->protocol == htons(ETH_P_SLOW))) { >>>> + /* LACPDU packets should go to exact delivery */ >>>> + const unsigned char *dest = eth_hdr(skb)->h_dest; >>>> + >>>> + if (is_link_local_ether_addr(dest) && dest[5] == 0x02) >>>> + return RX_HANDLER_EXACT; >>>I believe every link-local-frame should get this treatment whether >>>it's 802.3ad or otherwise (e.g. LLDP etc.), no? >>>BTW same should be true for bonding too (of course except LACP since >>>it handles/consumes it!) >> >> I think so as well, but stayed more conservative for this fix. LLDP case >> is handled in bridge rx_handler though... >> >bridge rx_handler when team is in bridge, otherwise these link-local >frames will be appear on master. So I guess it's a choice between >being conservative (and fix only LACP case as this fix does) or fix a >generic case. Let's be conservative in -net and possibly fix change this as a follow-up in net-next > >> >>>> + } >>>> + return RX_HANDLER_ANOTHER; >>>> +} >>>> + >>>> struct lb_priv; >>>> >>>> typedef struct team_port *lb_select_tx_port_func_t(struct team *, >>>> @@ -652,6 +665,7 @@ static const struct team_mode_ops lb_mode_ops = { >>>> .port_enter = lb_port_enter, >>>> .port_leave = lb_port_leave, >>>> .port_disabled = lb_port_disabled, >>>> + .receive = lb_receive, >>>> .transmit = lb_transmit, >>>> }; >>>> >>>> -- >>>> 2.5.5 >>>>