From patchwork Mon Apr 11 20:43:52 2011 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: 90651 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 C3821B6F0A for ; Tue, 12 Apr 2011 06:44:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755770Ab1DKUok (ORCPT ); Mon, 11 Apr 2011 16:44:40 -0400 Received: from thalia-smout.broadpark.no ([80.202.8.21]:46879 "EHLO thalia-smout.broadpark.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755651Ab1DKUoj (ORCPT ); Mon, 11 Apr 2011 16:44:39 -0400 MIME-version: 1.0 Content-transfer-encoding: 8BIT Content-type: text/plain; charset=UTF-8 Received: from terra-smin.broadpark.no ([80.202.8.13]) by thalia-smout.broadpark.no (Sun Java(tm) System Messaging Server 7u3-15.01 64bit (built Feb 12 2010)) with ESMTP id <0LJI00AC99LZVC00@thalia-smout.broadpark.no> for netdev@vger.kernel.org; Mon, 11 Apr 2011 22:44:23 +0200 (CEST) Received: from localhost.localdomain ([80.203.137.187]) by terra-smin.broadpark.no (Sun Java(tm) System Messaging Server 7u3-15.01 64bit (built Feb 12 2010)) with ESMTP id <0LJI0082H9LXJMZ0@terra-smin.broadpark.no> for netdev@vger.kernel.org; Mon, 11 Apr 2011 22:44:23 +0200 (CEST) From: sjur.brandeland@stericsson.com To: davem@davemloft.net Cc: netdev@vger.kernel.org, Stephen Hemminger , sjurbren@gmail.com, =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= Subject: [PATCH net-next-2.6 3/3] caif: Add BUG_ON if dev_info is missing in packet Date: Mon, 11 Apr 2011 22:43:52 +0200 Message-id: <1302554632-13638-4-git-send-email-sjur.brandeland@stericsson.com> X-Mailer: git-send-email 1.7.0.4 In-reply-to: <1302554632-13638-1-git-send-email-sjur.brandeland@stericsson.com> References: <1302554632-13638-1-git-send-email-sjur.brandeland@stericsson.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Sjur Brændeland Signed-off-by: Sjur Brændeland --- net/caif/cfmuxl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/net/caif/cfmuxl.c b/net/caif/cfmuxl.c index 2ca9806..6bb338d 100644 --- a/net/caif/cfmuxl.c +++ b/net/caif/cfmuxl.c @@ -188,7 +188,8 @@ static int cfmuxl_transmit(struct cflayer *layr, struct cfpkt *pkt) u8 linkid; struct cflayer *dn; struct caif_payload_info *info = cfpkt_info(pkt); - dn = get_dn(muxl, cfpkt_info(pkt)->dev_info); + BUG_ON(!info); + dn = get_dn(muxl, info->dev_info); if (dn == NULL) { pr_warn("Send data on unknown phy ID = %d (0x%x)\n", info->dev_info->id, info->dev_info->id);