From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC761C43387 for ; Wed, 26 Dec 2018 23:22:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8C9AC20811 for ; Wed, 26 Dec 2018 23:22:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545866569; bh=TVByAtQRdmkzi5dHXKSG7U7CBInqIgH0DCdOFRMgcbE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Q+XYuMX2Z9pFEnHfUEfc6EnVg8rIwsRnTDWr59Zz75xvFfI9ebzQRx1UcPuG9/+xy m7golzNWI4KEKbyf8LUINn7oSmraSg/M5fIYaDHqw8I4u9jszFPTAPsBhRWOINmnwa sGA9jsSXRVEW2SJhXBDuB9l9596lYrR8M71StHYg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729669AbeLZXWs (ORCPT ); Wed, 26 Dec 2018 18:22:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:44042 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728645AbeLZXWT (ORCPT ); Wed, 26 Dec 2018 18:22:19 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D98D020811; Wed, 26 Dec 2018 23:22:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545866538; bh=TVByAtQRdmkzi5dHXKSG7U7CBInqIgH0DCdOFRMgcbE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hmeHZXxyID1L/Gtvp0wKtsejiTRvAATHQaj9IB9w+unOJjTXeMkOQU4ySv6/oWG/n TKLkJ/0QZRN4vCDTdoA4zZOMSn62o5EprN2L6EAEmwX3BFFR4cW7JgFTqXlEgS9ce1 QZphi2I3LY1ENidmSh/WMqR+Ob5IgW/jy6380FpI= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Juergen Gross , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 3.18 09/12] xen/netfront: tolerate frags with no data Date: Wed, 26 Dec 2018 17:57:37 -0500 Message-Id: <20181226225741.151608-9-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181226225741.151608-1-sashal@kernel.org> References: <20181226225741.151608-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Juergen Gross [ Upstream commit d81c5054a5d1d4999c7cdead7636b6cd4af83d36 ] At least old Xen net backends seem to send frags with no real data sometimes. In case such a fragment happens to occur with the frag limit already reached the frontend will BUG currently even if this situation is easily recoverable. Modify the BUG_ON() condition accordingly. Tested-by: Dietmar Hahn Signed-off-by: Juergen Gross Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- 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 3bbfb09af65f..5d11e60d4995 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -913,7 +913,7 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue, if (skb_shinfo(skb)->nr_frags == MAX_SKB_FRAGS) { unsigned int pull_to = NETFRONT_SKB_CB(skb)->pull_to; - BUG_ON(pull_to <= skb_headlen(skb)); + BUG_ON(pull_to < skb_headlen(skb)); __pskb_pull_tail(skb, pull_to - skb_headlen(skb)); } BUG_ON(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS); -- 2.19.1