Unverified Commit 15bc30b3 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6260 packet: move from strlcpy with unused retval to strscpy 

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

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 9b3a35a7 40a1fb49

net/packet/af_packet.c

+2 −2
Original line number Diff line number Diff line
@@ -1849,7 +1849,7 @@ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, 
	 */



	spkt->spkt_family = dev->type;

	strlcpy(spkt->spkt_device, dev->name, sizeof(spkt->spkt_device));

	strscpy(spkt->spkt_device, dev->name, sizeof(spkt->spkt_device));

	spkt->spkt_protocol = skb->protocol;



	/*
@@ -3495,7 +3495,7 @@ static int packet_getname_spkt(struct socket *sock, struct sockaddr *uaddr, 
	rcu_read_lock();

	dev = dev_get_by_index_rcu(sock_net(sk), READ_ONCE(pkt_sk(sk)->ifindex));

	if (dev)

		strlcpy(uaddr->sa_data, dev->name, sizeof(uaddr->sa_data));

		strscpy(uaddr->sa_data, dev->name, sizeof(uaddr->sa_data));

	rcu_read_unlock();



	return sizeof(*uaddr);