From patchwork Wed Apr 19 16:59:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 752372 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 3w7Ssf5GHKz9rvt for ; Thu, 20 Apr 2017 02:59:50 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="vbLfbHHO"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967462AbdDSQ7r (ORCPT ); Wed, 19 Apr 2017 12:59:47 -0400 Received: from mail-yb0-f173.google.com ([209.85.213.173]:35956 "EHLO mail-yb0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967453AbdDSQ7n (ORCPT ); Wed, 19 Apr 2017 12:59:43 -0400 Received: by mail-yb0-f173.google.com with SMTP id s22so9067026ybe.3 for ; Wed, 19 Apr 2017 09:59:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TLF48VRFxJMsG3hnKu3oCZn/hY83TqEdhs0vN6Cce50=; b=vbLfbHHOf1QsETkVXiyOy0mxuEHzV55WPBv5i7ox6ppMxG50EbPsgw9APS9mc9eQ0L tqdZUBjpkx+M7VuJplER2y7+vvfh8+lZPGqwCfyUzFwR4xvwrq/hiXb7qN2bkrSV3SZ/ O70n1tqvN/wlRigjUxM5dcWJoXuxV71omGHlEtR13uc2X17l7xQJdCk4Nmc6Rk8C8tXh Qxptp4CZwlP3i52Ir4eltJDiiqxRUoCqXWBX0XpTpdauLKWgCXGV0ouJI/RcwNjrq7uc xlLMsR9A21oJ5NO83p5ReLXdnM1Wx+vVA6wnhMQZKBxaQjmu5SLHAwSJ+NnUdSyVFZIv OFlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TLF48VRFxJMsG3hnKu3oCZn/hY83TqEdhs0vN6Cce50=; b=MHMg3N5mt1/bFzsejDXnSkRBfOjYhyhIe1QwBKPsWbDt7i9vyd7sl0HldVnuMBdHYP lDDtLBJxvlTurL2kAbIHgq7qIQwD1YZiATbHISV8aEKR9HWVibRkzX7KVfAFWJt3kImC ppHTYuZsai4LRs7Ubvw0aSdvwJA7lEUVsY/69TIy8nGQYRJKnqkTMKb1uWhfjiLtC3Pp gVZKgINq1AC/Gi8Yy+dbqyF8Qj2jGg7HQuvfBN4gprlvZBNPKv8PFofKNJA6xMkSOVpR lPBWUSJQT8Qd1CokOulzw2ESZMAPZv19RQVN6usfF8FhaHwIZXdLP5dA4RLmglQewjih dMSw== X-Gm-Message-State: AN3rC/4doLDewogZjpu+nJM2Cx1lSByuKXx+LhBKqxjHVACtHOeRkKSq OxkrrFGJw5UesXCt X-Received: by 10.99.123.20 with SMTP id w20mr3845445pgc.223.1492621182385; Wed, 19 Apr 2017 09:59:42 -0700 (PDT) Received: from localhost ([2620:0:1000:3012:ad35:d84e:939a:990a]) by smtp.gmail.com with ESMTPSA id p16sm5675825pgc.4.2017.04.19.09.59.41 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 19 Apr 2017 09:59:41 -0700 (PDT) From: Eric Dumazet To: "David S . Miller" Cc: netdev , James Hughes , Eric Dumazet , Eric Dumazet , Matthew Garrett Subject: [PATCH net 5/6] ch9200: use skb_cow_head() to deal with cloned skbs Date: Wed, 19 Apr 2017 09:59:25 -0700 Message-Id: <20170419165926.30631-6-edumazet@google.com> X-Mailer: git-send-email 2.12.2.816.g2cccc81164-goog In-Reply-To: <20170419165926.30631-1-edumazet@google.com> References: <20170419165926.30631-1-edumazet@google.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We need to ensure there is enough headroom to push extra header, but we also need to check if we are allowed to change headers. skb_cow_head() is the proper helper to deal with this. Fixes: 4a476bd6d1d9 ("usbnet: New driver for QinHeng CH9200 devices") Signed-off-by: Eric Dumazet Cc: James Hughes Cc: Matthew Garrett --- drivers/net/usb/ch9200.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/usb/ch9200.c b/drivers/net/usb/ch9200.c index 8a40202c0a1732850da1b2eb64af21470b9c85b4..c4f1c363e24b89404c6834312074f8a4451ded50 100644 --- a/drivers/net/usb/ch9200.c +++ b/drivers/net/usb/ch9200.c @@ -254,14 +254,9 @@ static struct sk_buff *ch9200_tx_fixup(struct usbnet *dev, struct sk_buff *skb, tx_overhead = 0x40; len = skb->len; - if (skb_headroom(skb) < tx_overhead) { - struct sk_buff *skb2; - - skb2 = skb_copy_expand(skb, tx_overhead, 0, flags); + if (skb_cow_head(skb, tx_overhead)) { dev_kfree_skb_any(skb); - skb = skb2; - if (!skb) - return NULL; + return NULL; } __skb_push(skb, tx_overhead);