From nobody Mon Apr 6 23:16:27 2026 Received: from out-177.mta0.migadu.com (out-177.mta0.migadu.com [91.218.175.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E1FE43C278D for ; Tue, 17 Mar 2026 12:46:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773751587; cv=none; b=Awi1aWG9pKxhur2RHCuGOBE/61rFnoDuxO6H7Ezftm/k264z0SPJoDIwhgu1T/5qUbv05fSSOmdKo70Mz6UI+/NrMb+o/Kr5X7epMZ3jFLCJqiF8dXCyA+jfsipJImrVvLXlBBFQzm2v3kXEDCrgsz3F2QA2qSS9BYQoo5aTSW8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773751587; c=relaxed/simple; bh=KHjVHmdOcLNmGZAyn7tooEy1Kx+wxf3e5BSCVJsWmlk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wov7AqNbULX8yyuk8A2mPKw4YSqlzr1m5rn3kn7zCSdcJa759AoXdiu4tEtVCgn0CVqrvHt6Or63xwAxLgmB4SNNJjnleMw56skArrbnoabPC4uerUVCmM6ahKVj83I1NsBBjINf0ogbxOCXWd9wuc2jPR+55zy6EdDhMC2ec/o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=qsF84kkQ; arc=none smtp.client-ip=91.218.175.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="qsF84kkQ" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1773751583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=khSgOBqCoxy3Zwj3XKNDf9aztagyH8OjV1iqIQwDlxU=; b=qsF84kkQSm+NvqMBabXhFbW7ZClpkoYV1MOKJPvxV0uV9RGf/KaSTSmp6tvIsaeFIiBm3I yMQDYtZ3LJW/JM/kH4c9vp0FxfjjOy0fzFGcF9AaOPGPruiGMxvTcx5a48Y5QzW7K/Nj+j XuSKwu69tnItm5YodcLOqwzaURC8yKs= From: Jiayuan Chen To: netdev@vger.kernel.org Cc: Jiayuan Chen , syzbot+3d8bc31c45e11450f24c@syzkaller.appspotmail.com, Jiayuan Chen , Jiri Pirko , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH net v2 1/2] team: fix header_ops type confusion with non-Ethernet ports Date: Tue, 17 Mar 2026 20:45:53 +0800 Message-ID: <20260317124606.157035-2-jiayuan.chen@linux.dev> In-Reply-To: <20260317124606.157035-1-jiayuan.chen@linux.dev> References: <20260317124606.157035-1-jiayuan.chen@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Jiayuan Chen Similar to commit 950803f72547 ("bonding: fix type confusion in bond_setup_by_slave()") team has the same class of header_ops type confusion. For non-Ethernet ports, team_setup_by_port() copies port_dev->header_ops directly. When the team device later calls dev_hard_header() or dev_parse_header(), these callbacks can run with the team net_device instead of the real lower device, so netdev_priv(dev) is interpreted as the wrong private type and can crash. Fix this by introducing team header_ops wrappers for create/parse, selecting a team port under RCU, and calling the lower device callbacks with port->dev, so each callback always sees the correct net_device context. Also pass the selected lower device to the lower parse callback, so recursion is bounded in stacked non-Ethernet topologies and parse callbacks always run with the correct device context. Fixes: 1d76efe1577b ("team: add support for non-ethernet devices") Reported-by: syzbot+3d8bc31c45e11450f24c@syzkaller.appspotmail.com Closes: https://lore.kernel.org/all/69b46af7.050a0220.36eb34.000e.GAE@googl= e.com/T/ Cc: Jiayuan Chen Signed-off-by: Jiayuan Chen --- drivers/net/team/team_core.c | 60 +++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c index b7282f5c9632..b3f659ed06ca 100644 --- a/drivers/net/team/team_core.c +++ b/drivers/net/team/team_core.c @@ -2058,6 +2058,64 @@ static const struct ethtool_ops team_ethtool_ops =3D= { * rt netlink interface ***********************/ =20 +/* For tx path we need a linkup && enabled port; for parse any port suffic= es. */ +static struct team_port *team_header_port_get_rcu(struct team *team, bool = txable) +{ + struct team_port *port; + + list_for_each_entry_rcu(port, &team->port_list, list) { + if (!txable || team_port_txable(port)) + return port; + } + + return NULL; +} + +static int team_header_create(struct sk_buff *skb, struct net_device *team= _dev, + unsigned short type, const void *daddr, + const void *saddr, unsigned int len) +{ + struct team *team =3D netdev_priv(team_dev); + const struct header_ops *port_ops; + struct team_port *port; + int ret =3D 0; + + rcu_read_lock(); + port =3D team_header_port_get_rcu(team, true); + if (port) { + port_ops =3D READ_ONCE(port->dev->header_ops); + if (port_ops && port_ops->create) + ret =3D port_ops->create(skb, port->dev, + type, daddr, saddr, len); + } + rcu_read_unlock(); + return ret; +} + +static int team_header_parse(const struct sk_buff *skb, const struct net_d= evice *dev, + unsigned char *haddr) +{ + struct team *team =3D netdev_priv(dev); + const struct header_ops *port_ops; + struct team_port *port; + int ret =3D 0; + + rcu_read_lock(); + port =3D team_header_port_get_rcu(team, false); + if (port) { + port_ops =3D READ_ONCE(port->dev->header_ops); + if (port_ops && port_ops->parse) + ret =3D port_ops->parse(skb, port->dev, haddr); + } + rcu_read_unlock(); + return ret; +} + +static const struct header_ops team_header_ops =3D { + .create =3D team_header_create, + .parse =3D team_header_parse, +}; + static void team_setup_by_port(struct net_device *dev, struct net_device *port_dev) { @@ -2066,7 +2124,7 @@ static void team_setup_by_port(struct net_device *dev, if (port_dev->type =3D=3D ARPHRD_ETHER) dev->header_ops =3D team->header_ops_cache; else - dev->header_ops =3D port_dev->header_ops; + dev->header_ops =3D port_dev->header_ops ? &team_header_ops : NULL; dev->type =3D port_dev->type; dev->hard_header_len =3D port_dev->hard_header_len; dev->needed_headroom =3D port_dev->needed_headroom; --=20 2.43.0 From nobody Mon Apr 6 23:16:27 2026 Received: from out-189.mta0.migadu.com (out-189.mta0.migadu.com [91.218.175.189]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2BF333C5552 for ; Tue, 17 Mar 2026 12:46:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.189 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773751594; cv=none; b=I3v6q7CzhAXUIyOV21192a2Pah4tbZLOUeJvwN2QLtwM2vJ0MYLaQsv/bJmr7D8fwebcNnqZNc//cN7KRTAiFVRIzQUDcVuXWO1xsjo23iwHjOABu4wLxrnQuBaqqbkssThhxDwLZNWS0PZf7rHkMJiTkaON9LwO2KZ92gNiiJM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773751594; c=relaxed/simple; bh=Xgs1SRBbVuEypR66bTQGnKb5dvfLG//2KE1yqTpTMys=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VUsX91qdv7ONPk49guR0ehWos3hmWQkP3HAhr7raMnKIK7wlWpgFvBE//2UE/rZld5+mMe80UORgyG3wmMUUGr/tW5YiGEB/g+/KqEJlpnELNpD5y1VUQ796vOzGXof5euUrE2i3dLZ8PH12tWtrMXiVDEgPOS5QJkXr4us7ZdA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=U01ORx2z; arc=none smtp.client-ip=91.218.175.189 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="U01ORx2z" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1773751590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X/rT8519jVjklgrLEvs/kpwBmnhi/lRrahM6FMlLiEg=; b=U01ORx2zIfO3WyTMI1QV+Ep3zYeSk+R4nKv+SKPwGsxQ2DXwHNMCGEJwLkGdHt0IGl9yr0 Fs23kJe4iMxjkbDhIP9XUd3ebFB9+a6USR57spmzmUS3dBNRpKvFR4lacVVrcmCVuESykr Sq8YxvvBw/XTeJGfPq38oWt3Nn+nwDg= From: Jiayuan Chen To: netdev@vger.kernel.org Cc: Jiayuan Chen , Jiayuan Chen , Jiri Pirko , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH net v2 2/2] selftests: team: add non-Ethernet header_ops reproducer Date: Tue, 17 Mar 2026 20:45:54 +0800 Message-ID: <20260317124606.157035-3-jiayuan.chen@linux.dev> In-Reply-To: <20260317124606.157035-1-jiayuan.chen@linux.dev> References: <20260317124606.157035-1-jiayuan.chen@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Jiayuan Chen Add a team selftest that sets up: g0 (gre) -> b0 (bond) -> t0 (team) and triggers IPv6 traffic on t0. This reproduces the non-Ethernet header_ops confusion scenario and protects against regressions in stacked team/bond/gre configurations. Using this script, the panic reported by syzkaller can be reproduced [1]. After the fix: # ./non_ether_header_ops.sh PASS: non-Ethernet header_ops stacking did not crash [1] https://syzkaller.appspot.com/bug?extid=3D3d8bc31c45e11450f24c Cc: Jiayuan Chen Signed-off-by: Jiayuan Chen --- .../selftests/drivers/net/team/Makefile | 1 + .../testing/selftests/drivers/net/team/config | 2 + .../drivers/net/team/non_ether_header_ops.sh | 40 +++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100755 tools/testing/selftests/drivers/net/team/non_ether_head= er_ops.sh diff --git a/tools/testing/selftests/drivers/net/team/Makefile b/tools/test= ing/selftests/drivers/net/team/Makefile index 45a3e7ad3dcb..02d6f51d5a06 100644 --- a/tools/testing/selftests/drivers/net/team/Makefile +++ b/tools/testing/selftests/drivers/net/team/Makefile @@ -3,6 +3,7 @@ =20 TEST_PROGS :=3D \ dev_addr_lists.sh \ + non_ether_header_ops.sh \ options.sh \ propagation.sh \ refleak.sh \ diff --git a/tools/testing/selftests/drivers/net/team/config b/tools/testin= g/selftests/drivers/net/team/config index 558e1d0cf565..40fdd5fbcbdb 100644 --- a/tools/testing/selftests/drivers/net/team/config +++ b/tools/testing/selftests/drivers/net/team/config @@ -1,5 +1,7 @@ +CONFIG_BONDING=3Dy CONFIG_DUMMY=3Dy CONFIG_IPV6=3Dy +CONFIG_NET_IPGRE=3Dy CONFIG_MACVLAN=3Dy CONFIG_NETDEVSIM=3Dm CONFIG_NET_TEAM=3Dy diff --git a/tools/testing/selftests/drivers/net/team/non_ether_header_ops.= sh b/tools/testing/selftests/drivers/net/team/non_ether_header_ops.sh new file mode 100755 index 000000000000..19bd57f40688 --- /dev/null +++ b/tools/testing/selftests/drivers/net/team/non_ether_header_ops.sh @@ -0,0 +1,40 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# +# Reproduce the non-Ethernet header_ops confusion scenario with: +# g0 (gre) -> b0 (bond) -> t0 (team) +# +# Before the fix, direct header_ops inheritance in this stack could call +# callbacks with the wrong net_device context and crash. + +lib_dir=3D$(dirname "$0") +source "$lib_dir"/../../../net/lib.sh + +trap cleanup_all_ns EXIT + +setup_ns ns1 + +ip -n "$ns1" link add d0 type dummy +ip -n "$ns1" addr add 10.10.10.1/24 dev d0 +ip -n "$ns1" link set d0 up + +ip -n "$ns1" link add g0 type gre local 10.10.10.1 +ip -n "$ns1" link add b0 type bond mode active-backup +ip -n "$ns1" link add t0 type team + +ip -n "$ns1" link set g0 master b0 +ip -n "$ns1" link set b0 master t0 + +ip -n "$ns1" link set g0 up +ip -n "$ns1" link set b0 up +ip -n "$ns1" link set t0 up + +# GRE makes team inherit IFF_POINTOPOINT|IFF_NOARP, so IPv4 skips +# dev_hard_header() entirely... use IPv6 NDP which still calls it. +ip -n "$ns1" -6 addr add 2001:db8:1::1/64 dev t0 nodad +for i in $(seq 1 20); do + ip netns exec "$ns1" ping -6 -I t0 ff02::1 -c1 -W1 &>/dev/null || true +done + +echo "PASS: non-Ethernet header_ops stacking did not crash" +exit "$EXIT_STATUS" --=20 2.43.0