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

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

net: Pass kern from net_proto_family.create to sk_alloc 



In preparation for changing how struct net is refcounted
on kernel sockets pass the knowledge that we are creating
a kernel socket from sock_create_kern through to sk_alloc.

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

crypto/af_alg.c

+2 −2
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) 
	if (!type)

		goto unlock;



	sk2 = sk_alloc(sock_net(sk), PF_ALG, GFP_KERNEL, &alg_proto);

	sk2 = sk_alloc(sock_net(sk), PF_ALG, GFP_KERNEL, &alg_proto, 0);

	err = -ENOMEM;

	if (!sk2)

		goto unlock;
@@ -324,7 +324,7 @@ static int alg_create(struct net *net, struct socket *sock, int protocol, 
		return -EPROTONOSUPPORT;



	err = -ENOMEM;

	sk = sk_alloc(net, PF_ALG, GFP_KERNEL, &alg_proto);

	sk = sk_alloc(net, PF_ALG, GFP_KERNEL, &alg_proto, kern);

	if (!sk)

		goto out;

drivers/isdn/mISDN/socket.c

+6 −6
Original line number Diff line number Diff line
@@ -601,14 +601,14 @@ static const struct proto_ops data_sock_ops = { 
};



static int

data_sock_create(struct net *net, struct socket *sock, int protocol)

data_sock_create(struct net *net, struct socket *sock, int protocol, int kern)

{

	struct sock *sk;



	if (sock->type != SOCK_DGRAM)

		return -ESOCKTNOSUPPORT;



	sk = sk_alloc(net, PF_ISDN, GFP_KERNEL, &mISDN_proto);

	sk = sk_alloc(net, PF_ISDN, GFP_KERNEL, &mISDN_proto, kern);

	if (!sk)

		return -ENOMEM;
@@ -756,14 +756,14 @@ static const struct proto_ops base_sock_ops = { 




static int

base_sock_create(struct net *net, struct socket *sock, int protocol)

base_sock_create(struct net *net, struct socket *sock, int protocol, int kern)

{

	struct sock *sk;



	if (sock->type != SOCK_RAW)

		return -ESOCKTNOSUPPORT;



	sk = sk_alloc(net, PF_ISDN, GFP_KERNEL, &mISDN_proto);

	sk = sk_alloc(net, PF_ISDN, GFP_KERNEL, &mISDN_proto, kern);

	if (!sk)

		return -ENOMEM;
@@ -785,7 +785,7 @@ mISDN_sock_create(struct net *net, struct socket *sock, int proto, int kern) 


	switch (proto) {

	case ISDN_P_BASE:

		err = base_sock_create(net, sock, proto);

		err = base_sock_create(net, sock, proto, kern);

		break;

	case ISDN_P_TE_S0:

	case ISDN_P_NT_S0:
@@ -799,7 +799,7 @@ mISDN_sock_create(struct net *net, struct socket *sock, int proto, int kern) 
	case ISDN_P_B_L2DTMF:

	case ISDN_P_B_L2DSP:

	case ISDN_P_B_L2DSPHDLC:

		err = data_sock_create(net, sock, proto);

		err = data_sock_create(net, sock, proto, kern);

		break;

	default:

		return err;

drivers/net/macvtap.c

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ static int macvtap_open(struct inode *inode, struct file *file) 


	err = -ENOMEM;

	q = (struct macvtap_queue *)sk_alloc(net, AF_UNSPEC, GFP_KERNEL,

					     &macvtap_proto);

					     &macvtap_proto, 0);

	if (!q)

		goto out;

drivers/net/ppp/pppoe.c

+2 −2
Original line number Diff line number Diff line
@@ -546,11 +546,11 @@ static struct proto pppoe_sk_proto __read_mostly = { 
 * Initialize a new struct sock.

 *

 **********************************************************************/

static int pppoe_create(struct net *net, struct socket *sock)

static int pppoe_create(struct net *net, struct socket *sock, int kern)

{

	struct sock *sk;



	sk = sk_alloc(net, PF_PPPOX, GFP_KERNEL, &pppoe_sk_proto);

	sk = sk_alloc(net, PF_PPPOX, GFP_KERNEL, &pppoe_sk_proto, kern);

	if (!sk)

		return -ENOMEM;

drivers/net/ppp/pppox.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static int pppox_create(struct net *net, struct socket *sock, int protocol, 
	    !try_module_get(pppox_protos[protocol]->owner))

		goto out;



	rc = pppox_protos[protocol]->create(net, sock);

	rc = pppox_protos[protocol]->create(net, sock, kern);



	module_put(pppox_protos[protocol]->owner);

out: