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

Commit e32123e5 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

netlink: rename ssk to sk in struct netlink_skb_params 



Memory mapped netlink needs to store the receiving userspace socket
when sending from the kernel to userspace. Rename 'ssk' to 'sk' to
avoid confusion.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cd967e05

include/linux/netlink.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ struct netlink_skb_parms { 
	struct scm_creds	creds;		/* Skb credentials	*/

	__u32			portid;

	__u32			dst_group;

	struct sock		*ssk;

	struct sock		*sk;

};



#define NETLINK_CB(skb)		(*(struct netlink_skb_parms*)&((skb)->cb))

net/ipv4/inet_diag.c

+3 −3
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *in_s 
	}



	err = sk_diag_fill(sk, rep, req,

			   sk_user_ns(NETLINK_CB(in_skb).ssk),

			   sk_user_ns(NETLINK_CB(in_skb).sk),

			   NETLINK_CB(in_skb).portid,

			   nlh->nlmsg_seq, 0, nlh);

	if (err < 0) {
@@ -630,7 +630,7 @@ static int inet_csk_diag_dump(struct sock *sk, 
		return 0;



	return inet_csk_diag_fill(sk, skb, r,

				  sk_user_ns(NETLINK_CB(cb->skb).ssk),

				  sk_user_ns(NETLINK_CB(cb->skb).sk),

				  NETLINK_CB(cb->skb).portid,

				  cb->nlh->nlmsg_seq, NLM_F_MULTI, cb->nlh);

}
@@ -805,7 +805,7 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk, 
			}



			err = inet_diag_fill_req(skb, sk, req,

					       sk_user_ns(NETLINK_CB(cb->skb).ssk),

					       sk_user_ns(NETLINK_CB(cb->skb).sk),

					       NETLINK_CB(cb->skb).portid,

					       cb->nlh->nlmsg_seq, cb->nlh);

			if (err < 0) {

net/ipv4/udp_diag.c

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static int sk_diag_dump(struct sock *sk, struct sk_buff *skb, 
		return 0;



	return inet_sk_diag_fill(sk, NULL, skb, req,

			sk_user_ns(NETLINK_CB(cb->skb).ssk),

			sk_user_ns(NETLINK_CB(cb->skb).sk),

			NETLINK_CB(cb->skb).portid,

			cb->nlh->nlmsg_seq, NLM_F_MULTI, cb->nlh);

}
@@ -71,7 +71,7 @@ static int udp_dump_one(struct udp_table *tbl, struct sk_buff *in_skb, 
		goto out;



	err = inet_sk_diag_fill(sk, NULL, rep, req,

			   sk_user_ns(NETLINK_CB(in_skb).ssk),

			   sk_user_ns(NETLINK_CB(in_skb).sk),

			   NETLINK_CB(in_skb).portid,

			   nlh->nlmsg_seq, 0, nlh);

	if (err < 0) {

net/netfilter/nfnetlink_log.c

+1 −1
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ nfulnl_recv_config(struct sock *ctnl, struct sk_buff *skb, 


			inst = instance_create(net, group_num,

					       NETLINK_CB(skb).portid,

					       sk_user_ns(NETLINK_CB(skb).ssk));

					       sk_user_ns(NETLINK_CB(skb).sk));

			if (IS_ERR(inst)) {

				ret = PTR_ERR(inst);

				goto out;

net/netlink/af_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -891,7 +891,7 @@ static int netlink_unicast_kernel(struct sock *sk, struct sk_buff *skb, 
	if (nlk->netlink_rcv != NULL) {

		ret = skb->len;

		skb_set_owner_r(skb, sk);

		NETLINK_CB(skb).ssk = ssk;

		NETLINK_CB(skb).sk = ssk;

		nlk->netlink_rcv(skb);

		consume_skb(skb);

	} else {