From patchwork Wed Aug 30 17:32:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 807788 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HsATkDYD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xjCJc1Lvyz9sN7 for ; Thu, 31 Aug 2017 03:33:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752412AbdH3RdC (ORCPT ); Wed, 30 Aug 2017 13:33:02 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:33069 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752016AbdH3RdB (ORCPT ); Wed, 30 Aug 2017 13:33:01 -0400 Received: by mail-pg0-f68.google.com with SMTP id m15so5545854pgc.0 for ; Wed, 30 Aug 2017 10:33:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:subject:from:to:cc:date:mime-version :content-transfer-encoding; bh=ZIOFgTRl1luit0QX4N3dGRimU9cgronAZKKPzU0Udp8=; b=HsATkDYDiukqFVEMDahHw9vE2pXc+17mBZglc+mIluYjPaJVw7dsEKIl7VoJFIUOZT H64C/+Y9dM2htDN+aGF7oZ9iw7ZwJoxlAh4qdcEAwCeO1MLWtOkjEWGSjm3iPEO8SaZc gLioT0qfxgARRBygDs5jKB3Lf46p/jRQKMNu2SnH9ZdL7h6QeJ9T69GAyYzprmype7Aw vq3RqN6zXNJ2t8yvadySGz4P33e9LLyc4y4RpXNdC4tWA0UWffUUi74qiXZfGIGL2KKX JNPlOqpF01sh/LhEr4Ehi+EpY8X3oFetDV5AncoYf0+Ro7LlGzAKiKHshmlwNIUuhwEG udoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:mime-version :content-transfer-encoding; bh=ZIOFgTRl1luit0QX4N3dGRimU9cgronAZKKPzU0Udp8=; b=ct+dtp5Gi9zM6sjLpghZlZquB74acUU1bfRFFOZIaC5Z2/2SeWyk0nPzEenkp4Ujg2 9Jucf8evOY59o9twYqgLBMtuIk906OZpCmYPSpAxm0LDNRUAgUGxELKkTaAod+CrJZMS 5tk9J+JuOqx+zwvEp7BaiR6visEURVJI1ZQP+/6iIrZMG4NS82ys5Et/YZvrBJachb6B 2jjQ2esl52xl3KHBiRUMWdJO2UEJc+Bn3ajoydrxTz6YjEggqR4k25pfP0CRELP+LCMk O34ceITF7BLfq3KgPokB+kSnPMUfxwFzsTaEgKhUoNytY5/mz//MAzl/Lu0XoESAoqEp BO0Q== X-Gm-Message-State: AHYfb5iMl9+GJweX+ArsYJHYdWsCubW9UJDtsa8kNTuKDKOOLGbgtKUR 1n1VkFs1AraBI/sV X-Received: by 10.99.140.14 with SMTP id m14mr2373749pgd.106.1504114380671; Wed, 30 Aug 2017 10:33:00 -0700 (PDT) Received: from ?IPv6:2620:15c:2c1:100:dc1f:953d:4193:6c45? ([2620:15c:2c1:100:dc1f:953d:4193:6c45]) by smtp.googlemail.com with ESMTPSA id a15sm10335144pfl.1.2017.08.30.10.32.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Aug 2017 10:32:59 -0700 (PDT) Message-ID: <1504114378.11498.124.camel@edumazet-glaptop3.roam.corp.google.com> Subject: [PATCH net-next] xen-netfront: be more drop monitor friendly From: Eric Dumazet To: David Miller Cc: netdev Date: Wed, 30 Aug 2017 10:32:58 -0700 X-Mailer: Evolution 3.10.4-0ubuntu2 Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eric Dumazet xennet_start_xmit() might copy skb with inappropriate layout into a fresh one. Old skb is freed, and at this point it is not a drop, but a consume. New skb will then be either consumed or dropped. Signed-off-by: Eric Dumazet --- drivers/net/xen-netfront.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 7b61adb6270c..523387e71a80 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -611,7 +611,7 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev) nskb = skb_copy(skb, GFP_ATOMIC); if (!nskb) goto drop; - dev_kfree_skb_any(skb); + dev_consume_skb_any(skb); skb = nskb; page = virt_to_page(skb->data); offset = offset_in_page(skb->data);