From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 28 Feb 2024 06:04:36 +0000 (+0100)
Subject: fix up queue-5.10/arp-prevent-overflow-in-arp_req_get.patch
X-Git-Tag: v4.19.308~1^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d4ec55ff266077fdb3ed5dd0b674a94b01bf02c;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up queue-5.10/arp-prevent-overflow-in-arp_req_get.patch
---

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 <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;