From patchwork Mon Jun 25 17:49:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: sjur.brandeland@stericsson.com X-Patchwork-Id: 167184 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 161C0B6FAB for ; Tue, 26 Jun 2012 03:50:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754251Ab2FYRtz (ORCPT ); Mon, 25 Jun 2012 13:49:55 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:34031 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753651Ab2FYRty (ORCPT ); Mon, 25 Jun 2012 13:49:54 -0400 Received: by mail-lb0-f174.google.com with SMTP id gm6so6807265lbb.19 for ; Mon, 25 Jun 2012 10:49:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=6rQIsKYGcNNAQMofIErjS2uyOvsaRDoPh48sCERqpJA=; b=R2PXXGYFunVZ84dnXM+m2i1CKlwqiwEgwOVjh1ax49qxDa7MUuW9Zp8iIl7xOhV0Zi Rs6P9qEkJlhlExAQhMTPfwPCydri9xc0CAEpMTgZwxSw0q6ooJ49ouAprhMx0MW9PlgT np3GLlJIB4nIoeoYGeFlUr1DQTDQ+4ddE1CoQT3sakL4yNgZTqydq9M2mxpkSHe12QgP 7lqUYJMiaYd4viedNaFuMgjxUK1jLWtIJN5uwXS+DgXaHyM02HXWzAzNKZt+bccmDcgz OYP1kQiM9zLSo85Wm3t63RYOuGsc/5HyaoCgKxhdJYR8SIgFh9Ld1g3yxaHEDic2KGsd ZVcw== Received: by 10.152.105.51 with SMTP id gj19mr12926081lab.38.1340646593605; Mon, 25 Jun 2012 10:49:53 -0700 (PDT) Received: from sjur-laptop.stericsson.local ([212.4.57.94]) by mx.google.com with ESMTPS id h9sm6809882lbi.9.2012.06.25.10.49.52 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 25 Jun 2012 10:49:52 -0700 (PDT) From: sjur.brandeland@stericsson.com To: davem@davemloft.net Cc: netdev@vger.kernel.org, sjurbren@gmail.com, Kim Lilliestierna XX , Kim Lilliestierna , =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= Subject: [net-next 02/11] caif: added check for potential null return Date: Mon, 25 Jun 2012 19:49:34 +0200 Message-Id: <1340646583-21059-3-git-send-email-sjur.brandeland@stericsson.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1340646583-21059-1-git-send-email-sjur.brandeland@stericsson.com> References: <1340646583-21059-1-git-send-email-sjur.brandeland@stericsson.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Kim Lilliestierna XX Add check on NULL return from caif_get(). Signed-off-by: Kim Lilliestierna Signed-off-by: Sjur Brændeland --- net/caif/caif_dev.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c index 92c9397..0f010af 100644 --- a/net/caif/caif_dev.c +++ b/net/caif/caif_dev.c @@ -129,6 +129,11 @@ void caif_flow_cb(struct sk_buff *skb) rcu_read_lock(); caifd = caif_get(skb->dev); + + WARN_ON(caifd == NULL); + if (caifd == NULL) + return; + caifd_hold(caifd); rcu_read_unlock();