From patchwork Sat Jun 20 10:07:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Smith X-Patchwork-Id: 28927 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 4CE7AB721A for ; Sat, 20 Jun 2009 20:08:18 +1000 (EST) Received: by ozlabs.org (Postfix) id 3957FDDD1C; Sat, 20 Jun 2009 20:08:18 +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 BECC6DDD0C for ; Sat, 20 Jun 2009 20:08:17 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751313AbZFTKHo (ORCPT ); Sat, 20 Jun 2009 06:07:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751048AbZFTKHn (ORCPT ); Sat, 20 Jun 2009 06:07:43 -0400 Received: from smtp4.adam.net.au ([202.136.110.247]:40248 "EHLO smtp4.adam.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750952AbZFTKHm (ORCPT ); Sat, 20 Jun 2009 06:07:42 -0400 X-Greylist: delayed 501 seconds by postgrey-1.27 at vger.kernel.org; Sat, 20 Jun 2009 06:07:42 EDT Received: from 114-30-113-20.ip.adam.com.au ([114.30.113.20] helo=opy.nosense.org) by smtp4.adam.net.au with esmtp (Exim 4.63) (envelope-from ) id 1MHxU8-0005wY-Ad; Sat, 20 Jun 2009 19:37:44 +0930 Received: from opy.nosense.org (localhost.localdomain [127.0.0.1]) by opy.nosense.org (Postfix) with SMTP id C260349298; Sat, 20 Jun 2009 19:37:43 +0930 (CST) Date: Sat, 20 Jun 2009 19:37:43 +0930 From: Mark Smith To: netdev@vger.kernel.org, davem@davemloft.net Subject: [PATCH] econet: failed calls to skb_share_check() and pskb_may_pull() are kernel errors, so return NET_RX_BAD Message-Id: <20090620193743.9d0efe8d.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 As per the following #define and comment in netdevice.h, #define NET_RX_BAD 5 /* packet dropped due to kernel error */ return NET_RX_BAD when skb_share_check() or pskb_may_pull() fail in econet_rcv(). 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..b363ac5 100644 --- a/net/econet/af_econet.c +++ b/net/econet/af_econet.c @@ -1072,10 +1072,12 @@ static int econet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet goto drop; if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) - return NET_RX_DROP; + return NET_RX_BAD; - if (!pskb_may_pull(skb, sizeof(struct ec_framehdr))) - goto drop; + if (!pskb_may_pull(skb, sizeof(struct ec_framehdr))) { + kfree_skb(skb); + return NET_RX_BAD; + } hdr = (struct ec_framehdr *) skb->data;