Skip to content

Commit ad4350e

Browse files
Nikolay Aleksandrovgregkh
authored andcommitted
net: bridge: mcast: fix stale nsrcs pointer in igmp3/mld2 report handling
[ Upstream commit e57f618 ] We take a pointer to grec prior to calling pskb_may_pull and use it afterwards to get nsrcs so record nsrcs before the pull when handling igmp3 and we get a pointer to nsrcs and call pskb_may_pull when handling mld2 which again could lead to reading 2 bytes out-of-bounds. ================================================================== BUG: KASAN: use-after-free in br_multicast_rcv+0x480c/0x4ad0 [bridge] Read of size 2 at addr ffff8880421302b4 by task ksoftirqd/1/16 CPU: 1 PID: 16 Comm: ksoftirqd/1 Tainted: G OE 5.2.0-rc6+ #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1 04/01/2014 Call Trace: dump_stack+0x71/0xab print_address_description+0x6a/0x280 ? br_multicast_rcv+0x480c/0x4ad0 [bridge] __kasan_report+0x152/0x1aa ? br_multicast_rcv+0x480c/0x4ad0 [bridge] ? br_multicast_rcv+0x480c/0x4ad0 [bridge] kasan_report+0xe/0x20 br_multicast_rcv+0x480c/0x4ad0 [bridge] ? br_multicast_disable_port+0x150/0x150 [bridge] ? ktime_get_with_offset+0xb4/0x150 ? __kasan_kmalloc.constprop.6+0xa6/0xf0 ? __netif_receive_skb+0x1b0/0x1b0 ? br_fdb_update+0x10e/0x6e0 [bridge] ? br_handle_frame_finish+0x3c6/0x11d0 [bridge] br_handle_frame_finish+0x3c6/0x11d0 [bridge] ? br_pass_frame_up+0x3a0/0x3a0 [bridge] ? virtnet_probe+0x1c80/0x1c80 [virtio_net] br_handle_frame+0x731/0xd90 [bridge] ? select_idle_sibling+0x25/0x7d0 ? br_handle_frame_finish+0x11d0/0x11d0 [bridge] __netif_receive_skb_core+0xced/0x2d70 ? virtqueue_get_buf_ctx+0x230/0x1130 [virtio_ring] ? do_xdp_generic+0x20/0x20 ? virtqueue_napi_complete+0x39/0x70 [virtio_net] ? virtnet_poll+0x94d/0xc78 [virtio_net] ? receive_buf+0x5120/0x5120 [virtio_net] ? __netif_receive_skb_one_core+0x97/0x1d0 __netif_receive_skb_one_core+0x97/0x1d0 ? __netif_receive_skb_core+0x2d70/0x2d70 ? _raw_write_trylock+0x100/0x100 ? __queue_work+0x41e/0xbe0 process_backlog+0x19c/0x650 ? _raw_read_lock_irq+0x40/0x40 net_rx_action+0x71e/0xbc0 ? __switch_to_asm+0x40/0x70 ? napi_complete_done+0x360/0x360 ? __switch_to_asm+0x34/0x70 ? __switch_to_asm+0x40/0x70 ? __schedule+0x85e/0x14d0 __do_softirq+0x1db/0x5f9 ? takeover_tasklets+0x5f0/0x5f0 run_ksoftirqd+0x26/0x40 smpboot_thread_fn+0x443/0x680 ? sort_range+0x20/0x20 ? schedule+0x94/0x210 ? __kthread_parkme+0x78/0xf0 ? sort_range+0x20/0x20 kthread+0x2ae/0x3a0 ? kthread_create_worker_on_cpu+0xc0/0xc0 ret_from_fork+0x35/0x40 The buggy address belongs to the page: page:ffffea0001084c00 refcount:0 mapcount:-128 mapping:0000000000000000 index:0x0 flags: 0xffffc000000000() raw: 00ffffc000000000 ffffea0000cfca08 ffffea0001098608 0000000000000000 raw: 0000000000000000 0000000000000003 00000000ffffff7f 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff888042130180: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ffff888042130200: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff > ffff888042130280: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ^ ffff888042130300: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ffff888042130380: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ================================================================== Disabling lock debugging due to kernel taint Fixes: bc8c20a ("bridge: multicast: treat igmpv3 report with INCLUDE and no sources as a leave") Reported-by: Martin Weinelt <martin@linuxlounge.net> Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Tested-by: Martin Weinelt <martin@linuxlounge.net> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2eb5ddc commit ad4350e

1 file changed

Lines changed: 17 additions & 12 deletions

File tree

net/bridge/br_multicast.c

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,6 +1011,7 @@ static int br_ip4_multicast_igmp3_report(struct net_bridge *br,
10111011
int type;
10121012
int err = 0;
10131013
__be32 group;
1014+
u16 nsrcs;
10141015

10151016
ih = igmpv3_report_hdr(skb);
10161017
num = ntohs(ih->ngrec);
@@ -1024,8 +1025,9 @@ static int br_ip4_multicast_igmp3_report(struct net_bridge *br,
10241025
grec = (void *)(skb->data + len - sizeof(*grec));
10251026
group = grec->grec_mca;
10261027
type = grec->grec_type;
1028+
nsrcs = ntohs(grec->grec_nsrcs);
10271029

1028-
len += ntohs(grec->grec_nsrcs) * 4;
1030+
len += nsrcs * 4;
10291031
if (!pskb_may_pull(skb, len))
10301032
return -EINVAL;
10311033

@@ -1045,7 +1047,7 @@ static int br_ip4_multicast_igmp3_report(struct net_bridge *br,
10451047

10461048
if ((type == IGMPV3_CHANGE_TO_INCLUDE ||
10471049
type == IGMPV3_MODE_IS_INCLUDE) &&
1048-
ntohs(grec->grec_nsrcs) == 0) {
1050+
nsrcs == 0) {
10491051
br_ip4_multicast_leave_group(br, port, group, vid);
10501052
} else {
10511053
err = br_ip4_multicast_add_group(br, port, group, vid);
@@ -1078,23 +1080,26 @@ static int br_ip6_multicast_mld2_report(struct net_bridge *br,
10781080
len = skb_transport_offset(skb) + sizeof(*icmp6h);
10791081

10801082
for (i = 0; i < num; i++) {
1081-
__be16 *nsrcs, _nsrcs;
1082-
1083-
nsrcs = skb_header_pointer(skb,
1084-
len + offsetof(struct mld2_grec,
1085-
grec_nsrcs),
1086-
sizeof(_nsrcs), &_nsrcs);
1087-
if (!nsrcs)
1083+
__be16 *_nsrcs, __nsrcs;
1084+
u16 nsrcs;
1085+
1086+
_nsrcs = skb_header_pointer(skb,
1087+
len + offsetof(struct mld2_grec,
1088+
grec_nsrcs),
1089+
sizeof(__nsrcs), &__nsrcs);
1090+
if (!_nsrcs)
10881091
return -EINVAL;
10891092

1093+
nsrcs = ntohs(*_nsrcs);
1094+
10901095
if (!pskb_may_pull(skb,
10911096
len + sizeof(*grec) +
1092-
sizeof(struct in6_addr) * ntohs(*nsrcs)))
1097+
sizeof(struct in6_addr) * nsrcs))
10931098
return -EINVAL;
10941099

10951100
grec = (struct mld2_grec *)(skb->data + len);
10961101
len += sizeof(*grec) +
1097-
sizeof(struct in6_addr) * ntohs(*nsrcs);
1102+
sizeof(struct in6_addr) * nsrcs;
10981103

10991104
/* We treat these as MLDv1 reports for now. */
11001105
switch (grec->grec_type) {
@@ -1112,7 +1117,7 @@ static int br_ip6_multicast_mld2_report(struct net_bridge *br,
11121117

11131118
if ((grec->grec_type == MLD2_CHANGE_TO_INCLUDE ||
11141119
grec->grec_type == MLD2_MODE_IS_INCLUDE) &&
1115-
ntohs(*nsrcs) == 0) {
1120+
nsrcs == 0) {
11161121
br_ip6_multicast_leave_group(br, port, &grec->grec_mca,
11171122
vid);
11181123
} else {

0 commit comments

Comments
 (0)