From patchwork Thu Jul 17 19:10:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Kiss X-Patchwork-Id: 371245 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 CAF8B14017D for ; Fri, 18 Jul 2014 05:13:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755264AbaGQTMz (ORCPT ); Thu, 17 Jul 2014 15:12:55 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:9952 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755187AbaGQTMy (ORCPT ); Thu, 17 Jul 2014 15:12:54 -0400 X-IronPort-AV: E=Sophos;i="5.01,679,1400025600"; d="scan'208";a="153868248" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 17 Jul 2014 19:12:23 +0000 Received: from mrteufel.uk.xensource.com (10.80.2.133) by FTLPEX01CL03.citrite.net (10.13.107.80) with Microsoft SMTP Server id 14.3.181.6; Thu, 17 Jul 2014 15:12:22 -0400 From: Zoltan Kiss To: Wei Liu , Ian Campbell CC: Zoltan Kiss , , , Subject: [PATCH for stable 3.15 4/4] xen-netback: Fix pointer incrementation to avoid incorrect logging Date: Thu, 17 Jul 2014 20:10:29 +0100 Message-ID: <1405624229-21817-4-git-send-email-zoltan.kiss@citrix.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1405624229-21817-1-git-send-email-zoltan.kiss@citrix.com> References: <1405624229-21817-1-git-send-email-zoltan.kiss@citrix.com> MIME-Version: 1.0 X-Originating-IP: [10.80.2.133] X-DLP: MIA2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Due to this pointer is increased prematurely, the error log contains rubbish. Signed-off-by: Zoltan Kiss Reported-by: Armin Zentai Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: xen-devel@lists.xenproject.org --- 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/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index 7a36ecf..36fb4ff 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -1020,7 +1020,6 @@ static int xenvif_tx_check_gop(struct xenvif *vif, /* Check status of header. */ err = (*gopp_copy)->status; - (*gopp_copy)++; if (unlikely(err)) { if (net_ratelimit()) netdev_dbg(vif->dev, @@ -1030,6 +1029,7 @@ static int xenvif_tx_check_gop(struct xenvif *vif, (*gopp_copy)->source.u.ref); xenvif_idx_release(vif, first_pending_idx, XEN_NETIF_RSP_ERROR); } + (*gopp_copy)++; check_frags: for (i = 0; i < nr_frags; i++, gop_map++) {