[PATCH 0/2] net: bonding: fix type-confusion in bonding header_ops

Kota Toda posted 2 patches 1 month ago
There is a newer version of this series
drivers/net/bonding/bond_main.c | 66 ++++++++++++++++++++++++++++++++-
include/linux/netdevice.h       | 28 +++++++++-----
include/net/bonding.h           |  5 +++
include/net/cfg802154.h         |  2 +-
net/core/neighbour.c            |  6 +--
net/ipv4/arp.c                  |  2 +-
net/ipv6/ndisc.c                |  2 +-
7 files changed, 95 insertions(+), 16 deletions(-)
[PATCH 0/2] net: bonding: fix type-confusion in bonding header_ops
Posted by Kota Toda 1 month ago
In bond_setup_by_slave(), the slave’s header_ops are unconditionally
copied into the bonding device. As a result, the bonding device may invoke
the slave-specific header operations on itself, causing
netdev_priv(bond_dev) (a struct bonding) to be incorrectly interpreted
as the slave's private-data type.

This type-confusion bug can lead to out-of-bounds writes into the skb,
resulting in memory corruption.

Patch 1 stores the slave's header_ops in struct bonding and sets
wrapper callbacks in bond_In bond_setup_by_slave(), the slave’s
header_ops are unconditionally
copied into the bonding device. As a result, the bonding device may invoke
the slave-specific header operations on itself, causing
netdev_priv(bond_dev) (a struct bonding) to be incorrectly interpreted
as the slave's private-data type.

Patch 2 uses READ_ONCE when loading header_ops callbacks
to avoid races with concurrent updates.

Signed-off-by: Kota Toda <kota.toda@gmo-cybersecurity.com>
Co-developed-by: Yuki Koike <yuki.koike@gmo-cybersecurity.com>
Signed-off-by: Yuki Koike <yuki.koike@gmo-cybersecurity.com>
--

Kota Toda (2):
  net: bonding: fix type-confusion in bonding header_ops
  net: add READ_ONCE for header_ops callbacks

 drivers/net/bonding/bond_main.c | 66 ++++++++++++++++++++++++++++++++-
 include/linux/netdevice.h       | 28 +++++++++-----
 include/net/bonding.h           |  5 +++
 include/net/cfg802154.h         |  2 +-
 net/core/neighbour.c            |  6 +--
 net/ipv4/arp.c                  |  2 +-
 net/ipv6/ndisc.c                |  2 +-
 7 files changed, 95 insertions(+), 16 deletions(-)

--
2.53.0