From 2d4ec55ff266077fdb3ed5dd0b674a94b01bf02c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 28 Feb 2024 07:04:36 +0100 Subject: [PATCH] fix up queue-5.10/arp-prevent-overflow-in-arp_req_get.patch --- queue-5.10/arp-prevent-overflow-in-arp_req_get.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/queue-5.10/arp-prevent-overflow-in-arp_req_get.patch b/queue-5.10/arp-prevent-overflow-in-arp_req_get.patch index 3ec2d595b31..6489e63ddfd 100644 --- a/queue-5.10/arp-prevent-overflow-in-arp_req_get.patch +++ b/queue-5.10/arp-prevent-overflow-in-arp_req_get.patch @@ -90,7 +90,7 @@ Signed-off-by: Greg Kroah-Hartman 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; -- 2.47.3