Commit a9a50701 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'ieee802154-for-davem-2021-08-12' of... 

Merge tag 'ieee802154-for-davem-2021-08-12' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan

Stefan Schmidt says:

====================
ieee802154 for net 2021-08-12

Mostly fixes coming from bot reports. Dongliang Mu tackled some syzkaller
reports in hwsim again and Takeshi Misawa a memory leak  in  ieee802154 raw.

* tag 'ieee802154-for-davem-2021-08-12' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan:
  net: Fix memory leak in ieee802154_raw_deliver
  ieee802154: hwsim: fix GPF in hwsim_new_edge_nl
  ieee802154: hwsim: fix GPF in hwsim_set_edge_lqi
====================

Link: https://lore.kernel.org/r/20210812183912.1663996-1-stefan@datenfreihafen.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 49b0b6ff 1090340f

drivers/net/ieee802154/mac802154_hwsim.c

+3 −3
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ static int hwsim_new_edge_nl(struct sk_buff *msg, struct genl_info *info) 
	struct hwsim_edge *e;

	u32 v0, v1;



	if (!info->attrs[MAC802154_HWSIM_ATTR_RADIO_ID] &&

	if (!info->attrs[MAC802154_HWSIM_ATTR_RADIO_ID] ||

	    !info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE])

		return -EINVAL;
@@ -528,14 +528,14 @@ static int hwsim_set_edge_lqi(struct sk_buff *msg, struct genl_info *info) 
	u32 v0, v1;

	u8 lqi;



	if (!info->attrs[MAC802154_HWSIM_ATTR_RADIO_ID] &&

	if (!info->attrs[MAC802154_HWSIM_ATTR_RADIO_ID] ||

	    !info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE])

		return -EINVAL;



	if (nla_parse_nested_deprecated(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX, info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE], hwsim_edge_policy, NULL))

		return -EINVAL;



	if (!edge_attrs[MAC802154_HWSIM_EDGE_ATTR_ENDPOINT_ID] &&

	if (!edge_attrs[MAC802154_HWSIM_EDGE_ATTR_ENDPOINT_ID] ||

	    !edge_attrs[MAC802154_HWSIM_EDGE_ATTR_LQI])

		return -EINVAL;

net/ieee802154/socket.c

+6 −1
Original line number Diff line number Diff line
@@ -984,6 +984,11 @@ static const struct proto_ops ieee802154_dgram_ops = { 
	.sendpage	   = sock_no_sendpage,

};



static void ieee802154_sock_destruct(struct sock *sk)

{

	skb_queue_purge(&sk->sk_receive_queue);

}



/* Create a socket. Initialise the socket, blank the addresses

 * set the state.

 */
@@ -1024,7 +1029,7 @@ static int ieee802154_create(struct net *net, struct socket *sock, 
	sock->ops = ops;



	sock_init_data(sock, sk);

	/* FIXME: sk->sk_destruct */

	sk->sk_destruct = ieee802154_sock_destruct;

	sk->sk_family = PF_IEEE802154;



	/* Checksums on by default */