Message ID | 20201109125020.110090756@linuxfoundation.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <SRS0=upl/=EP=vger.kernel.org=stable-owner@kernel.org> 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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 510ABC2D0A3 for <stable@archiver.kernel.org>; Mon, 9 Nov 2020 13:31:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 032D22065D for <stable@archiver.kernel.org>; Mon, 9 Nov 2020 13:31:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604928697; bh=fqkd3J7PxfSZN8b53+ZRU0sKCm72tFn640C8C2F2RPw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Q5mPHJlFt/VIKWQaABBfUiHIjtLStRF8yhkhQNMUrbU95wKLGSwVRUSinr83R4buL l+p2jUI2bxyioQxarbNFJhOqu99hdkF5N0YZP+pK5Vpz+xdQ/6BbSjUe3TKaLLII0c /XlpYBxDluGyO0PkYJZdtAW4b3J0GEAfS/8bbN1g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730752AbgKINb3 (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 9 Nov 2020 08:31:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:34236 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730931AbgKINJR (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 9 Nov 2020 08:09:17 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 6DFBD20731; Mon, 9 Nov 2020 13:09:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604927356; bh=fqkd3J7PxfSZN8b53+ZRU0sKCm72tFn640C8C2F2RPw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JEhsnXFxXuz9iZrzjimGukva1uRfCifLIjefK3gZIMsMi2fBQHrlSkHm2qRK2oANO DXwnESkMbXEmW0dEldlIO/oNkkwSjAqPoFMwTtrctXiiyQyXO1IYx3tbCXQ87i2Djn Ws2eX+GELR1VqivLlmgbNGJR/6IWqHy6tEwpyFOY= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Klaus Doth <krnl@doth.eu>, Mark Deneen <mdeneen@saucontech.com>, Jakub Kicinski <kuba@kernel.org> Subject: [PATCH 4.19 04/71] cadence: force nonlinear buffers to be cloned Date: Mon, 9 Nov 2020 13:54:58 +0100 Message-Id: <20201109125020.110090756@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125019.906191744@linuxfoundation.org> References: <20201109125019.906191744@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -1704,7 +1704,8 @@ static inline int macb_clear_csum(struct static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev) { - bool cloned = skb_cloned(*skb) || skb_header_cloned(*skb); + bool cloned = skb_cloned(*skb) || skb_header_cloned(*skb) || + skb_is_nonlinear(*skb); int padlen = ETH_ZLEN - (*skb)->len; int headroom = skb_headroom(*skb); int tailroom = skb_tailroom(*skb);