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=-10.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 C178BC43612 for ; Fri, 11 Jan 2019 15:11:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 86CAF20874 for ; Fri, 11 Jan 2019 15:11:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547219469; bh=1HqbdEcZHvrxG3kdlPPJHT+Ax2MnSDeGx0MFFpdy/tk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=R+rzqErWlDaWuZpQfThuzvVPeqoT1vm6aoMW3GPfbOOw+8qN8peXiAUV9klaxAOXk 4cCWGQhZzl6jGHcb+FopqFIKLCP2USPCLmxdyTvjpD2kBXA6ecKBfKcVVRmdp06YSl bumtwvZNdqBNxNrmSw8xm/eySPw063Gp27bMS39Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387633AbfAKOQY (ORCPT ); Fri, 11 Jan 2019 09:16:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:60756 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387624AbfAKOQV (ORCPT ); Fri, 11 Jan 2019 09:16:21 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D5217214D8; Fri, 11 Jan 2019 14:16:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547216181; bh=1HqbdEcZHvrxG3kdlPPJHT+Ax2MnSDeGx0MFFpdy/tk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0s6OEwpL063QgC1UQOA/TS87dfdnVTyDEE4maA7cth4S/7UdpAZerC8qqCDKZU4ob vusnH69aPcxmVT9lA9/6jkBNPvxmKqRvXSdnl4O6cT+IKHb+Fc73MyKP8qMOjP2ZBG Nh5BEr4vjZj00MW8OEh80OYubTA7iJG9f3JPQKzU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dietmar Hahn , Juergen Gross , "David S. Miller" Subject: [PATCH 3.18 18/47] xen/netfront: tolerate frags with no data Date: Fri, 11 Jan 2019 15:08:03 +0100 Message-Id: <20190111130958.460866136@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111130956.170952125@linuxfoundation.org> References: <20190111130956.170952125@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ 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: Greg Kroah-Hartman --- drivers/net/xen-netfront.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -913,7 +913,7 @@ static RING_IDX xennet_fill_frags(struct 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);