From patchwork Sat Jun 20 10:34:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Smith X-Patchwork-Id: 28928 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 6F883B7251 for ; Sat, 20 Jun 2009 20:34:51 +1000 (EST) Received: by ozlabs.org (Postfix) id 5C1B1DDDA0; Sat, 20 Jun 2009 20:34:51 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id DEA1BDDD1B for ; Sat, 20 Jun 2009 20:34:50 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751547AbZFTKem (ORCPT ); Sat, 20 Jun 2009 06:34:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751384AbZFTKel (ORCPT ); Sat, 20 Jun 2009 06:34:41 -0400 Received: from smtp2.adam.net.au ([202.136.110.251]:49725 "EHLO smtp2.adam.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750900AbZFTKek (ORCPT ); Sat, 20 Jun 2009 06:34:40 -0400 Received: from 114-30-113-20.ip.adam.com.au ([114.30.113.20] helo=opy.nosense.org) by smtp2.adam.net.au with esmtp (Exim 4.63) (envelope-from ) id 1MHxuB-00053b-B5; Sat, 20 Jun 2009 20:04:39 +0930 Received: from opy.nosense.org (localhost.localdomain [127.0.0.1]) by opy.nosense.org (Postfix) with SMTP id B7E5649298; Sat, 20 Jun 2009 20:04:38 +0930 (CST) Date: Sat, 20 Jun 2009 20:04:38 +0930 From: Mark Smith To: netdev@vger.kernel.org, davem@davemloft.net Subject: [PATCH] econet: have failed ec_queue_packet() call return NET_RX_BAD Message-Id: <20090620200438.b5443520.lk-netdev@lk-netdev.nosense.org> X-Mailer: Sylpheed 2.6.0 (GTK+ 2.16.2; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org econet_rcv() calls ec_queue_packet(). The return from ec_queue_packet() is the direct result of a call to sock_queue_rcv_skb(). Error returns from ec_queue_packet() and therefore sock_queue_rcv_skb() are due to kernel errors, so have econet_rcv() return NET_RX_BAD in this case. If my understanding is correct, then Signed-off-by: Mark Smith --- 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/econet/af_econet.c b/net/econet/af_econet.c index 6f479fa..07f0f90 100644 --- a/net/econet/af_econet.c +++ b/net/econet/af_econet.c @@ -1092,8 +1092,10 @@ static int econet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet goto drop; if (ec_queue_packet(sk, skb, edev->net, hdr->src_stn, hdr->cb, - hdr->port)) - goto drop; + hdr->port)) { + kfree_skb(skb); + return NET_RX_BAD; + } return 0;