]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix up queue-5.10/arp-prevent-overflow-in-arp_req_get.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Feb 2024 06:04:36 +0000 (07:04 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Feb 2024 06:04:36 +0000 (07:04 +0100)
queue-5.10/arp-prevent-overflow-in-arp_req_get.patch

index 3ec2d595b319c427ede1dc41048b3a27bb17e5a6..6489e63ddfdaf9616366742988f9339431dd7d98 100644 (file)
@@ -90,7 +90,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                        read_lock_bh(&neigh->lock);
 -                      memcpy(r->arp_ha.sa_data, neigh->ha, dev->addr_len);
 +                      memcpy(r->arp_ha.sa_data, neigh->ha,
-+                             min(dev->addr_len, sizeof(r->arp_ha.sa_data_min)));
++                             min(dev->addr_len, (unsigned char)sizeof(r->arp_ha.sa_data_min)));
                        r->arp_flags = arp_state_to_flags(neigh);
                        read_unlock_bh(&neigh->lock);
                        r->arp_ha.sa_family = dev->type;