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

Commit 5aa6bc02 authored by Yoshiyuki Kurauchi's avatar Yoshiyuki Kurauchi Committed by Greg Kroah-Hartman
Browse files

gtp: set NLM_F_MULTI flag in gtp_genl_dump_pdp() 



[ Upstream commit 846c68f7f1ac82c797a2f1db3344a2966c0fe2e1 ]

In drivers/net/gtp.c, gtp_genl_dump_pdp() should set NLM_F_MULTI
flag since it returns multipart message.
This patch adds a new arg "flags" in gtp_genl_fill_info() so that
flags can be set by the callers.

Signed-off-by: default avatarYoshiyuki Kurauchi <ahochauwaaaaa@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3c525647

drivers/net/gtp.c

+5 −4
Original line number Diff line number Diff line
@@ -1177,11 +1177,11 @@ static int gtp_genl_del_pdp(struct sk_buff *skb, struct genl_info *info) 
static struct genl_family gtp_genl_family;



static int gtp_genl_fill_info(struct sk_buff *skb, u32 snd_portid, u32 snd_seq,

			      u32 type, struct pdp_ctx *pctx)

			      int flags, u32 type, struct pdp_ctx *pctx)

{

	void *genlh;



	genlh = genlmsg_put(skb, snd_portid, snd_seq, &gtp_genl_family, 0,

	genlh = genlmsg_put(skb, snd_portid, snd_seq, &gtp_genl_family, flags,

			    type);

	if (genlh == NULL)

		goto nlmsg_failure;
@@ -1235,8 +1235,8 @@ static int gtp_genl_get_pdp(struct sk_buff *skb, struct genl_info *info) 
		goto err_unlock;

	}



	err = gtp_genl_fill_info(skb2, NETLINK_CB(skb).portid,

				 info->snd_seq, info->nlhdr->nlmsg_type, pctx);

	err = gtp_genl_fill_info(skb2, NETLINK_CB(skb).portid, info->snd_seq,

				 0, info->nlhdr->nlmsg_type, pctx);

	if (err < 0)

		goto err_unlock_free;
@@ -1279,6 +1279,7 @@ static int gtp_genl_dump_pdp(struct sk_buff *skb, 
				    gtp_genl_fill_info(skb,

					    NETLINK_CB(cb->skb).portid,

					    cb->nlh->nlmsg_seq,

					    NLM_F_MULTI,

					    cb->nlh->nlmsg_type, pctx)) {

					cb->args[0] = i;

					cb->args[1] = j;