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

Commit eeb1bd5c authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

net: Add a struct net parameter to sock_create_kern 



This is long overdue, and is part of cleaning up how we allocate kernel
sockets that don't reference count struct net.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 140e807d

drivers/block/drbd/drbd_receiver.c

+2 −2
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ static struct socket *drbd_try_connect(struct drbd_connection *connection) 
	memcpy(&peer_in6, &connection->peer_addr, peer_addr_len);



	what = "sock_create_kern";

	err = sock_create_kern(((struct sockaddr *)&src_in6)->sa_family,

	err = sock_create_kern(&init_net, ((struct sockaddr *)&src_in6)->sa_family,

			       SOCK_STREAM, IPPROTO_TCP, &sock);

	if (err < 0) {

		sock = NULL;
@@ -693,7 +693,7 @@ static int prepare_listen_socket(struct drbd_connection *connection, struct acce 
	memcpy(&my_addr, &connection->my_addr, my_addr_len);



	what = "sock_create_kern";

	err = sock_create_kern(((struct sockaddr *)&my_addr)->sa_family,

	err = sock_create_kern(&init_net, ((struct sockaddr *)&my_addr)->sa_family,

			       SOCK_STREAM, IPPROTO_TCP, &s_listen);

	if (err) {

		s_listen = NULL;

fs/afs/rxrpc.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ int afs_open_socket(void) 
		return -ENOMEM;

	}



	ret = sock_create_kern(AF_RXRPC, SOCK_DGRAM, PF_INET, &socket);

	ret = sock_create_kern(&init_net, AF_RXRPC, SOCK_DGRAM, PF_INET, &socket);

	if (ret < 0) {

		destroy_workqueue(afs_async_calls);

		_leave(" = %d [socket]", ret);

fs/dlm/lowcomms.c

+8 −8
Original line number Diff line number Diff line
@@ -921,8 +921,8 @@ static int tcp_accept_from_sock(struct connection *con) 
	mutex_unlock(&connections_lock);



	memset(&peeraddr, 0, sizeof(peeraddr));

	result = sock_create_kern(dlm_local_addr[0]->ss_family, SOCK_STREAM,

				  IPPROTO_TCP, &newsock);

	result = sock_create_kern(&init_net, dlm_local_addr[0]->ss_family,

				  SOCK_STREAM, IPPROTO_TCP, &newsock);

	if (result < 0)

		return -ENOMEM;
@@ -1173,8 +1173,8 @@ static void tcp_connect_to_sock(struct connection *con) 
		goto out;



	/* Create a socket to communicate with */

	result = sock_create_kern(dlm_local_addr[0]->ss_family, SOCK_STREAM,

				  IPPROTO_TCP, &sock);

	result = sock_create_kern(&init_net, dlm_local_addr[0]->ss_family,

				  SOCK_STREAM, IPPROTO_TCP, &sock);

	if (result < 0)

		goto out_err;
@@ -1258,8 +1258,8 @@ static struct socket *tcp_create_listen_sock(struct connection *con, 
		addr_len = sizeof(struct sockaddr_in6);



	/* Create a socket to communicate with */

	result = sock_create_kern(dlm_local_addr[0]->ss_family, SOCK_STREAM,

				  IPPROTO_TCP, &sock);

	result = sock_create_kern(&init_net, dlm_local_addr[0]->ss_family,

				  SOCK_STREAM, IPPROTO_TCP, &sock);

	if (result < 0) {

		log_print("Can't create listening comms socket");

		goto create_out;
@@ -1365,8 +1365,8 @@ static int sctp_listen_for_all(void) 


	log_print("Using SCTP for communications");



	result = sock_create_kern(dlm_local_addr[0]->ss_family, SOCK_SEQPACKET,

				  IPPROTO_SCTP, &sock);

	result = sock_create_kern(&init_net, dlm_local_addr[0]->ss_family,

				  SOCK_SEQPACKET, IPPROTO_SCTP, &sock);

	if (result < 0) {

		log_print("Can't create comms socket, check SCTP is loaded");

		goto out;

include/linux/net.h

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ void sock_unregister(int family); 
int __sock_create(struct net *net, int family, int type, int proto,

		  struct socket **res, int kern);

int sock_create(int family, int type, int proto, struct socket **res);

int sock_create_kern(int family, int type, int proto, struct socket **res);

int sock_create_kern(struct net *net, int family, int type, int proto, struct socket **res);

int sock_create_lite(int family, int type, int proto, struct socket **res);

void sock_release(struct socket *sock);

int sock_sendmsg(struct socket *sock, struct msghdr *msg);

net/bluetooth/rfcomm/core.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static int rfcomm_l2sock_create(struct socket **sock) 


	BT_DBG("");



	err = sock_create_kern(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP, sock);

	err = sock_create_kern(&init_net, PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP, sock);

	if (!err) {

		struct sock *sk = (*sock)->sk;

		sk->sk_data_ready   = rfcomm_l2data_ready;