From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758126AbbIVPMM (ORCPT ); Tue, 22 Sep 2015 11:12:12 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:60413 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753352AbbIVPMK (ORCPT ); Tue, 22 Sep 2015 11:12:10 -0400 Subject: Re: [PATCH] net: dsa: Fix Marvell Egress Trailer check To: Neil Armstrong , "David S. Miller" References: <56011F2E.5080208@baylibre.com> Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org From: Guenter Roeck Message-ID: <56016FC6.9030503@roeck-us.net> Date: Tue, 22 Sep 2015 08:12:06 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <56011F2E.5080208@baylibre.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated_sender: linux@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: linux@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/22/2015 02:28 AM, Neil Armstrong wrote: > The Marvell Egress rx trailer check must be fixed to > correctly detect bad bits in the third byte of the > Eggress trailer as described in the Table 28 of the > 88E6060 datasheet. > The current code incorrectly omits to check the third > byte and checks the fourth byte twice. > > Signed-off-by: Neil Armstrong Nice catch. Acked-by: Guenter Roeck > --- > net/dsa/tag_trailer.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/dsa/tag_trailer.c b/net/dsa/tag_trailer.c > index e268f9d..d0526a9 100644 > --- a/net/dsa/tag_trailer.c > +++ b/net/dsa/tag_trailer.c > @@ -84,7 +84,7 @@ static int trailer_rcv(struct sk_buff *skb, struct net_device *dev, > > trailer = skb_tail_pointer(skb) - 4; > if (trailer[0] != 0x80 || (trailer[1] & 0xf8) != 0x00 || > - (trailer[3] & 0xef) != 0x00 || trailer[3] != 0x00) > + (trailer[2] & 0xef) != 0x00 || trailer[3] != 0x00) > goto out_drop; > > source_port = trailer[1] & 7; >