Message ID | 20090807185122.30f022de.lk-netdev@lk-netdev.nosense.org |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Fri, 7 Aug 2009 18:51:22 +0930 Mark Smith <lk-netdev@lk-netdev.nosense.org> wrote: > > In all rx'd SKB cases, atalk_rcv() either eventually jumps to or falls through > to the label out:, which returns numeric 0. Numeric 0 corresponds to > NET_RX_SUCCESS, which is incorrect in failed SKB cases. <snip> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Mark Smith <lk-netdev@lk-netdev.nosense.org> Date: Fri, 7 Aug 2009 18:51:22 +0930 > > In all rx'd SKB cases, atalk_rcv() either eventually jumps to or falls through > to the label out:, which returns numeric 0. Numeric 0 corresponds to > NET_RX_SUCCESS, which is incorrect in failed SKB cases. > > This patch makes atalk_rcv() provide the correct returns by: > > o explicitly returning NET_RX_SUCCESS in the two success cases > o having the out: label return NET_RX_DROP, instead of numeric 0 > o making the failed SKB labels and processing more consistent with other > _rcv() routines in the kernel, simplifying validation and removing a > backwards goto > > Signed-off-by: Mark Smith <markzzzsmith@yahoo.com.au> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 12 Aug 2009 22:15:50 -0700 (PDT) David Miller <davem@davemloft.net> wrote: > From: Mark Smith <lk-netdev@lk-netdev.nosense.org> > Date: Fri, 7 Aug 2009 18:51:22 +0930 > > > > > In all rx'd SKB cases, atalk_rcv() either eventually jumps to or falls through > > to the label out:, which returns numeric 0. Numeric 0 corresponds to > > NET_RX_SUCCESS, which is incorrect in failed SKB cases. > > > > This patch makes atalk_rcv() provide the correct returns by: > > > > o explicitly returning NET_RX_SUCCESS in the two success cases > > o having the out: label return NET_RX_DROP, instead of numeric 0 > > o making the failed SKB labels and processing more consistent with other > > _rcv() routines in the kernel, simplifying validation and removing a > > backwards goto > > > > Signed-off-by: Mark Smith <markzzzsmith@yahoo.com.au> > > Applied. Thanks David. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 590b839..2377ebe 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c @@ -1398,7 +1398,7 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev, __u16 len_hops; if (!net_eq(dev_net(dev), &init_net)) - goto freeit; + goto drop; /* Don't mangle buffer if shared */ if (!(skb = skb_share_check(skb, GFP_ATOMIC))) @@ -1406,7 +1406,7 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev, /* Size check and make sure header is contiguous */ if (!pskb_may_pull(skb, sizeof(*ddp))) - goto freeit; + goto drop; ddp = ddp_hdr(skb); @@ -1424,7 +1424,7 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev, if (skb->len < sizeof(*ddp) || skb->len < (len_hops & 1023)) { pr_debug("AppleTalk: dropping corrupted frame (deh_len=%u, " "skb->len=%u)\n", len_hops & 1023, skb->len); - goto freeit; + goto drop; } /* @@ -1434,7 +1434,7 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev, if (ddp->deh_sum && atalk_checksum(skb, len_hops & 1023) != ddp->deh_sum) /* Not a valid AppleTalk frame - dustbin time */ - goto freeit; + goto drop; /* Check the packet is aimed at us */ if (!ddp->deh_dnet) /* Net 0 is 'this network' */ @@ -1447,7 +1447,7 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev, * AppleTalk iface */ atalk_route_packet(skb, dev, ddp, len_hops, origlen); - goto out; + return NET_RX_SUCCESS; } /* if IP over DDP is not selected this code will be optimized out */ @@ -1463,18 +1463,21 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev, sock = atalk_search_socket(&tosat, atif); if (!sock) /* But not one of our sockets */ - goto freeit; + goto drop; /* Queue packet (standard) */ skb->sk = sock; if (sock_queue_rcv_skb(sock, skb) < 0) - goto freeit; -out: - return 0; -freeit: + goto drop; + + return NET_RX_SUCCESS; + +drop: kfree_skb(skb); - goto out; +out: + return NET_RX_DROP; + } /*
In all rx'd SKB cases, atalk_rcv() either eventually jumps to or falls through to the label out:, which returns numeric 0. Numeric 0 corresponds to NET_RX_SUCCESS, which is incorrect in failed SKB cases. This patch makes atalk_rcv() provide the correct returns by: o explicitly returning NET_RX_SUCCESS in the two success cases o having the out: label return NET_RX_DROP, instead of numeric 0 o making the failed SKB labels and processing more consistent with other _rcv() routines in the kernel, simplifying validation and removing a backwards goto Signed-off-by: Mark Smith <markzzzsmith@yahoo.com.au> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html