Skip to content

Commit 38f88c4

Browse files
Eric Dumazetdavem330
authored andcommitted
bonding/alb: properly access headers in bond_alb_xmit()
syzbot managed to send an IPX packet through bond_alb_xmit() and af_packet and triggered a use-after-free. First, bond_alb_xmit() was using ipx_hdr() helper to reach the IPX header, but ipx_hdr() was using the transport offset instead of the network offset. In the particular syzbot report transport offset was 0xFFFF This patch removes ipx_hdr() since it was only (mis)used from bonding. Then we need to make sure IPv4/IPv6/IPX headers are pulled in skb->head before dereferencing anything. BUG: KASAN: use-after-free in bond_alb_xmit+0x153a/0x1590 drivers/net/bonding/bond_alb.c:1452 Read of size 2 at addr ffff8801ce56dfff by task syz-executor.2/18108 (if (ipx_hdr(skb)->ipx_checksum != IPX_NO_CHECKSUM) ...) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: [<ffffffff8441fc42>] __dump_stack lib/dump_stack.c:17 [inline] [<ffffffff8441fc42>] dump_stack+0x14d/0x20b lib/dump_stack.c:53 [<ffffffff81a7dec4>] print_address_description+0x6f/0x20b mm/kasan/report.c:282 [<ffffffff81a7e0ec>] kasan_report_error mm/kasan/report.c:380 [inline] [<ffffffff81a7e0ec>] kasan_report mm/kasan/report.c:438 [inline] [<ffffffff81a7e0ec>] kasan_report.cold+0x8c/0x2a0 mm/kasan/report.c:422 [<ffffffff81a7dc4f>] __asan_report_load_n_noabort+0xf/0x20 mm/kasan/report.c:469 [<ffffffff82c8c00a>] bond_alb_xmit+0x153a/0x1590 drivers/net/bonding/bond_alb.c:1452 [<ffffffff82c60c74>] __bond_start_xmit drivers/net/bonding/bond_main.c:4199 [inline] [<ffffffff82c60c74>] bond_start_xmit+0x4f4/0x1570 drivers/net/bonding/bond_main.c:4224 [<ffffffff83baa558>] __netdev_start_xmit include/linux/netdevice.h:4525 [inline] [<ffffffff83baa558>] netdev_start_xmit include/linux/netdevice.h:4539 [inline] [<ffffffff83baa558>] xmit_one net/core/dev.c:3611 [inline] [<ffffffff83baa558>] dev_hard_start_xmit+0x168/0x910 net/core/dev.c:3627 [<ffffffff83bacf35>] __dev_queue_xmit+0x1f55/0x33b0 net/core/dev.c:4238 [<ffffffff83bae3a8>] dev_queue_xmit+0x18/0x20 net/core/dev.c:4278 [<ffffffff84339189>] packet_snd net/packet/af_packet.c:3226 [inline] [<ffffffff84339189>] packet_sendmsg+0x4919/0x70b0 net/packet/af_packet.c:3252 [<ffffffff83b1ac0c>] sock_sendmsg_nosec net/socket.c:673 [inline] [<ffffffff83b1ac0c>] sock_sendmsg+0x12c/0x160 net/socket.c:684 [<ffffffff83b1f5a2>] __sys_sendto+0x262/0x380 net/socket.c:1996 [<ffffffff83b1f700>] SYSC_sendto net/socket.c:2008 [inline] [<ffffffff83b1f700>] SyS_sendto+0x40/0x60 net/socket.c:2004 Fixes: 1da177e ("Linux-2.6.12-rc2") Signed-off-by: Eric Dumazet <[email protected]> Reported-by: syzbot <[email protected]> Cc: Jay Vosburgh <[email protected]> Cc: Veaceslav Falico <[email protected]> Cc: Andy Gospodarek <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent d5b90e9 commit 38f88c4

File tree

2 files changed

+32
-17
lines changed

2 files changed

+32
-17
lines changed

drivers/net/bonding/bond_alb.c

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,26 +1383,31 @@ netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
13831383
bool do_tx_balance = true;
13841384
u32 hash_index = 0;
13851385
const u8 *hash_start = NULL;
1386-
struct ipv6hdr *ip6hdr;
13871386

13881387
skb_reset_mac_header(skb);
13891388
eth_data = eth_hdr(skb);
13901389

13911390
switch (ntohs(skb->protocol)) {
13921391
case ETH_P_IP: {
1393-
const struct iphdr *iph = ip_hdr(skb);
1392+
const struct iphdr *iph;
13941393

13951394
if (is_broadcast_ether_addr(eth_data->h_dest) ||
1396-
iph->daddr == ip_bcast ||
1397-
iph->protocol == IPPROTO_IGMP) {
1395+
!pskb_network_may_pull(skb, sizeof(*iph))) {
1396+
do_tx_balance = false;
1397+
break;
1398+
}
1399+
iph = ip_hdr(skb);
1400+
if (iph->daddr == ip_bcast || iph->protocol == IPPROTO_IGMP) {
13981401
do_tx_balance = false;
13991402
break;
14001403
}
14011404
hash_start = (char *)&(iph->daddr);
14021405
hash_size = sizeof(iph->daddr);
1403-
}
14041406
break;
1405-
case ETH_P_IPV6:
1407+
}
1408+
case ETH_P_IPV6: {
1409+
const struct ipv6hdr *ip6hdr;
1410+
14061411
/* IPv6 doesn't really use broadcast mac address, but leave
14071412
* that here just in case.
14081413
*/
@@ -1419,7 +1424,11 @@ netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
14191424
break;
14201425
}
14211426

1422-
/* Additianally, DAD probes should not be tx-balanced as that
1427+
if (!pskb_network_may_pull(skb, sizeof(*ip6hdr))) {
1428+
do_tx_balance = false;
1429+
break;
1430+
}
1431+
/* Additionally, DAD probes should not be tx-balanced as that
14231432
* will lead to false positives for duplicate addresses and
14241433
* prevent address configuration from working.
14251434
*/
@@ -1429,17 +1438,26 @@ netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
14291438
break;
14301439
}
14311440

1432-
hash_start = (char *)&(ipv6_hdr(skb)->daddr);
1433-
hash_size = sizeof(ipv6_hdr(skb)->daddr);
1441+
hash_start = (char *)&ip6hdr->daddr;
1442+
hash_size = sizeof(ip6hdr->daddr);
14341443
break;
1435-
case ETH_P_IPX:
1436-
if (ipx_hdr(skb)->ipx_checksum != IPX_NO_CHECKSUM) {
1444+
}
1445+
case ETH_P_IPX: {
1446+
const struct ipxhdr *ipxhdr;
1447+
1448+
if (pskb_network_may_pull(skb, sizeof(*ipxhdr))) {
1449+
do_tx_balance = false;
1450+
break;
1451+
}
1452+
ipxhdr = (struct ipxhdr *)skb_network_header(skb);
1453+
1454+
if (ipxhdr->ipx_checksum != IPX_NO_CHECKSUM) {
14371455
/* something is wrong with this packet */
14381456
do_tx_balance = false;
14391457
break;
14401458
}
14411459

1442-
if (ipx_hdr(skb)->ipx_type != IPX_TYPE_NCP) {
1460+
if (ipxhdr->ipx_type != IPX_TYPE_NCP) {
14431461
/* The only protocol worth balancing in
14441462
* this family since it has an "ARP" like
14451463
* mechanism
@@ -1448,9 +1466,11 @@ netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
14481466
break;
14491467
}
14501468

1469+
eth_data = eth_hdr(skb);
14511470
hash_start = (char *)eth_data->h_dest;
14521471
hash_size = ETH_ALEN;
14531472
break;
1473+
}
14541474
case ETH_P_ARP:
14551475
do_tx_balance = false;
14561476
if (bond_info->rlb_enabled)

include/net/ipx.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@ struct ipxhdr {
4747
/* From af_ipx.c */
4848
extern int sysctl_ipx_pprop_broadcasting;
4949

50-
static __inline__ struct ipxhdr *ipx_hdr(struct sk_buff *skb)
51-
{
52-
return (struct ipxhdr *)skb_transport_header(skb);
53-
}
54-
5550
struct ipx_interface {
5651
/* IPX address */
5752
__be32 if_netnum;

0 commit comments

Comments
 (0)