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.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 3FDC4C433DF for ; Mon, 12 Oct 2020 13:43:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EC04022203 for ; Mon, 12 Oct 2020 13:43:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602510199; bh=u1OySPcaotgKE1T1leil2PbA46WBXofxQknpYJSVmmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DGC9a3vpSSggwqyPGtNrGV9toWkMwGcMJP/bjuG1F2zBO2P14gAaavkCB4Hf54pIf lea1Y309rAuQLgOMfnSZ2FoaIEq7WGuAdERYkbI8sDvfAUXlxO/HDJn9jhD/W/ut9O xVoUJ22kp1PkBoib/vwWYwx9xi9jfiGa4RxZTrTE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731408AbgJLNnL (ORCPT ); Mon, 12 Oct 2020 09:43:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:46754 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731503AbgJLNms (ORCPT ); Mon, 12 Oct 2020 09:42:48 -0400 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 BD9C62222C; Mon, 12 Oct 2020 13:42:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602510150; bh=u1OySPcaotgKE1T1leil2PbA46WBXofxQknpYJSVmmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SMBGd122cKTw+0bDiCHAzlx317HnVLZh2bJD3TNAEkjaAso0X7IvpdySWU6OZacWw Fknjp6bpHvZ3BhlLJwxuDOS/o66fI2Pc+JJ+2rnodbh9UkzqHztfK9+fPIWeAW5Rxk BqPWlhFDYv9gBth9oMk9AAq/iz93EGUeCvjnm6gg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , "David S. Miller" Subject: [PATCH 5.4 44/85] team: set dev->needed_headroom in team_setup_by_port() Date: Mon, 12 Oct 2020 15:27:07 +0200 Message-Id: <20201012132634.975885361@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012132632.846779148@linuxfoundation.org> References: <20201012132632.846779148@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: X-Mailing-List: stable@vger.kernel.org From: Eric Dumazet commit 89d01748b2354e210b5d4ea47bc25a42a1b42c82 upstream. Some devices set needed_headroom. If we ignore it, we might end up crashing in various skb_push() for example in ipgre_header() since some layers assume enough headroom has been reserved. Fixes: 1d76efe1577b ("team: add support for non-ethernet devices") Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/team/team.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -2111,6 +2111,7 @@ static void team_setup_by_port(struct ne dev->header_ops = port_dev->header_ops; dev->type = port_dev->type; dev->hard_header_len = port_dev->hard_header_len; + dev->needed_headroom = port_dev->needed_headroom; dev->addr_len = port_dev->addr_len; dev->mtu = port_dev->mtu; memcpy(dev->broadcast, port_dev->broadcast, port_dev->addr_len);