Unverified Commit 6620766a authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6259 arp: Prevent overflow in arp_req_get(). 

Merge Pull Request from: @ci-robot 
 
PR sync from: Dong Chenchen <dongchenchen2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YATU4WEXWKYMA5HNCGCX237DS2QRMHZH/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9E2MB 
 
Link:https://gitee.com/openeuler/kernel/pulls/6259

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 0473be3c 33352416

net/ipv4/arp.c

+2 −1
Original line number Diff line number Diff line
@@ -1104,7 +1104,8 @@ static int arp_req_get(struct arpreq *r, struct net_device *dev) 
	if (neigh) {

		if (!(neigh->nud_state & NUD_NOARP)) {

			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, (unsigned char)sizeof(r->arp_ha.sa_data)));

			r->arp_flags = arp_state_to_flags(neigh);

			read_unlock_bh(&neigh->lock);

			r->arp_ha.sa_family = dev->type;