From patchwork Mon Mar 14 14:53:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 597062 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 3qP15H3lzxz9sdQ for ; Tue, 15 Mar 2016 01:55:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965194AbcCNOzP (ORCPT ); Mon, 14 Mar 2016 10:55:15 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:53446 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934480AbcCNOzN (ORCPT ); Mon, 14 Mar 2016 10:55:13 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0Ls9Oh-1ZgYP30l0p-013zir; Mon, 14 Mar 2016 15:54:46 +0100 From: Arnd Bergmann To: Shrikrishna Khare , "VMware, Inc." Cc: Arnd Bergmann , "David S. Miller" , Shreyas Bhatewara , Guolin Yang , Neil Horman , Alexey Khoroshilov , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] vmxnet3: fix lock imbalance in vmxnet3_tq_xmit() Date: Mon, 14 Mar 2016 15:53:57 +0100 Message-Id: <1457967280-4014226-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:T1/QMTYwdRhB5n0q/xl81chSPhd3JQEBZo9bV8+Q2PB+njLwUWk emwPMT2bSVTamrfjPTURTshgGv14vZ166pQWt9yQz7O9S4YSoo9me0KfxKslEEtACwNanem oLJReJTiFLibAjCqE3fyQj4VQvqzeJW+1Me/13IUXq3QeTdn+24VwH1nJxOAGDPWEx4rO5W HuX5zOgDVz5YZ2JS2gXqQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:ko59vwlYS60=:y68FSR/bGBXjJW8GXvWtpm EJYkSdTFvs7oXVryUCg2jXJ27SL/Let3r3shuochXCQ/gWBxAeuBZmt8kI7TvceqMnfQbo7+7 SHCzaiJJt9W+Ebh/ivrtcAFRARH9hRBJDjZ6f7vqg9q1qaRUihKJXb5eQ0E6cyK3Sf2hpRfY/ sIHyGlU7Vteb+EsCQbR8l+U5aWba0TBNorgJ6fy/Gf5tEnfJo5ZCInKzWMLlL32hiaIxflZFH /m+pYKovmZCScFeuGL1zEDfyoNhpzaebgqTaWKdAQXf9cXENlkIi56FF2OTUHr+no9jTZD9QE 7mzir2eeX9sGz2qEZZjaakDsjhJboK2a+Swn5VJLOHj3D51oz+CfAGfb9mC3wWDP8OVtsACQ8 yK8/SaJ1UblYAvVfegARu0sKuZlqjYD6ahrHAfGJKIufWAT1h6y15CtCgbeHOIBRHLZsQAhoJ lBX5vaG8gzWEuW7mKpyiX20S7mB238VOGFerK+xPmlO5Z+UJHZYXJdfDm4wvdfXQbYsJNIjnG z43ue6kI1lJOAywJsDKo4oEwsH4z3F6KYPJiDt0LLNDe3ZJuBs+yWHKyqsFZNfDNUGOizujTf /yLFQv73gIaqdK2XP+ldeEbhxzup6cj65ZV4fE9p+Bma9ex7ZOVptqneSckeCXQGP3bgBb/E8 uBpV+76VFrXBqcnsK6IpqDvSC3vfhaH8nHy0EtdidDB7OAvfrmHZs1KCVkfpBFb+7feY= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A recent bug fix rearranged the code in vmxnet3_tq_xmit() in a way that left the error handling for oversized headers unlock a lock that had not been taken yet. Gcc warns about the incorrect use of the 'flags' variable because of that: drivers/net/vmxnet3/vmxnet3_drv.c: In function 'vmxnet3_tq_xmit.constprop': include/linux/spinlock.h:246:3: error: 'flags' may be used uninitialized in this function [-Werror=maybe-uninitialized] This changes the error handling path to 'goto' the end of the function beyond the lock/unlock pair. Signed-off-by: Arnd Bergmann Fixes: cec05562fb1d ("vmxnet3: avoid calling pskb_may_pull with interrupts disabled") --- drivers/net/vmxnet3/vmxnet3_drv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index fc895d0e85d9..b2348f67b00a 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c @@ -1022,14 +1022,16 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq, if (ctx.mss) { if (unlikely(ctx.eth_ip_hdr_size + ctx.l4_hdr_size > VMXNET3_MAX_TX_BUF_SIZE)) { - goto hdr_too_big; + tq->stats.drop_oversized_hdr++; + goto drop_pkt; } } else { if (skb->ip_summed == CHECKSUM_PARTIAL) { if (unlikely(ctx.eth_ip_hdr_size + skb->csum_offset > VMXNET3_MAX_CSUM_OFFSET)) { - goto hdr_too_big; + tq->stats.drop_oversized_hdr++; + goto drop_pkt; } } } @@ -1123,8 +1125,6 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq, return NETDEV_TX_OK; -hdr_too_big: - tq->stats.drop_oversized_hdr++; unlock_drop_pkt: spin_unlock_irqrestore(&tq->tx_lock, flags); drop_pkt: