Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58050fce authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

net: Use NLMSG_DEFAULT_SIZE in combination with nlmsg_new() 



Using NLMSG_GOODSIZE results in multiple pages being used as
nlmsg_new() will automatically add the size of the netlink
header to the payload thus exceeding the page limit.

NLMSG_DEFAULT_SIZE takes this into account.

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Cc: Jiri Pirko <jpirko@redhat.com>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Sergey Lapin <slapin@ossfans.org>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Lauro Ramos Venancio <lauro.venancio@openbossa.org>
Cc: Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Reviewed-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f10d3f6

drivers/net/team/team.c

+4 −4
Original line number Diff line number Diff line
@@ -1476,7 +1476,7 @@ static int team_nl_cmd_noop(struct sk_buff *skb, struct genl_info *info) 
	void *hdr;

	int err;



	msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);

	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

	if (!msg)

		return -ENOMEM;
@@ -1538,7 +1538,7 @@ static int team_nl_send_generic(struct genl_info *info, struct team *team, 
	struct sk_buff *skb;

	int err;



	skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);

	skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

	if (!skb)

		return -ENOMEM;
@@ -1648,7 +1648,7 @@ static int __send_and_alloc_skb(struct sk_buff **pskb, 
		if (err)

			return err;

	}

	*pskb = genlmsg_new(NLMSG_DEFAULT_SIZE - GENL_HDRLEN, GFP_KERNEL);

	*pskb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL);

	if (!*pskb)

		return -ENOMEM;

	return 0;
@@ -2016,7 +2016,7 @@ static int team_nl_send_event_port_list_get(struct team *team) 
	int err;

	struct net *net = dev_net(team->dev);



	skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);

	skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

	if (!skb)

		return -ENOMEM;

drivers/net/wireless/mac80211_hwsim.c

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw, 
			skb_dequeue(&data->pending);

	}



	skb = genlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC);

	skb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_ATOMIC);

	if (skb == NULL)

		goto nla_put_failure;

include/net/genetlink.h

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#include <net/netlink.h>

#include <net/net_namespace.h>



#define GENLMSG_DEFAULT_SIZE (NLMSG_DEFAULT_SIZE - GENL_HDRLEN)



/**

 * struct genl_multicast_group - generic netlink multicast group

 * @name: name of the multicast group, names are per-family

net/ieee802154/netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct genl_family nl802154_family = { 
struct sk_buff *ieee802154_nl_create(int flags, u8 req)

{

	void *hdr;

	struct sk_buff *msg = nlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC);

	struct sk_buff *msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);

	unsigned long f;



	if (!msg)
@@ -80,7 +80,7 @@ struct sk_buff *ieee802154_nl_new_reply(struct genl_info *info, 
		int flags, u8 req)

{

	void *hdr;

	struct sk_buff *msg = nlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC);

	struct sk_buff *msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);



	if (!msg)

		return NULL;

net/ieee802154/nl-mac.c

+1 −1
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ static int ieee802154_list_iface(struct sk_buff *skb, 
	if (!dev)

		return -ENODEV;



	msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);

	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

	if (!msg)

		goto out_dev;