From patchwork Wed May 29 05:27:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 247112 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 C6E332C034A for ; Wed, 29 May 2013 15:27:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753832Ab3E2F1K (ORCPT ); Wed, 29 May 2013 01:27:10 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:46186 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752409Ab3E2F1I (ORCPT ); Wed, 29 May 2013 01:27:08 -0400 Received: from vergenet.net (p2155-ipngn4501marunouchi.tokyo.ocn.ne.jp [153.135.240.155]) by kirsty.vergenet.net (Postfix) with ESMTP id 421E525BF7E; Wed, 29 May 2013 15:27:07 +1000 (EST) Received: by vergenet.net (Postfix, from userid 7100) id 049527C1B59; Wed, 29 May 2013 14:27:50 +0900 (JST) From: Simon Horman To: David Miller Cc: netdev@vger.kernel.org, Simon Horman Subject: [PATCH 1/7] isdn: Correct comparison of skb->tail and skb-transport_header Date: Wed, 29 May 2013 14:27:42 +0900 Message-Id: <1369805268-6291-2-git-send-email-horms@verge.net.au> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1369805268-6291-1-git-send-email-horms@verge.net.au> References: <1369805268-6291-1-git-send-email-horms@verge.net.au> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This corrects an regression introduced by "net: Use 16bits for *_headers fields of struct skbuff" when NET_SKBUFF_DATA_USES_OFFSET is not set. In that case skb->tail will be a pointer whereas skb->transport_header will be an offset from head. This is corrected by using wrappers that ensure that the comparison is always between pointers. Signed-off-by: Simon Horman --- drivers/isdn/i4l/isdn_net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index 88d657d..8b98d53 100644 --- a/drivers/isdn/i4l/isdn_net.c +++ b/drivers/isdn/i4l/isdn_net.c @@ -885,7 +885,7 @@ isdn_net_log_skb(struct sk_buff *skb, isdn_net_local *lp) addinfo[0] = '\0'; /* This check stolen from 2.1.72 dev_queue_xmit_nit() */ - if (p < skb->data || skb->network_header >= skb->tail) { + if (p < skb->data || skb_network_header(skb) >= skb_tail_pointer(skb)) { /* fall back to old isdn_net_log_packet method() */ char *buf = skb->data;