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

Commit ba55275e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "tap: tap_open(): correctly initialize socket uid"

parents 27f28bc3 b70958e5

drivers/net/tap.c

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static int tap_open(struct inode *inode, struct file *file) 
	q->sock.state = SS_CONNECTED;

	q->sock.file = file;

	q->sock.ops = &tap_socket_ops;

	sock_init_data(&q->sock, &q->sk);

	sock_init_data_uid(&q->sock, &q->sk, inode->i_uid);

	q->sk.sk_write_space = tap_sock_write_space;

	q->sk.sk_destruct = tap_sock_destruct;

	q->flags = IFF_VNET_HDR | IFF_NO_PI | IFF_TAP;

drivers/net/tun.c

+1 −1
Original line number Diff line number Diff line
@@ -3257,7 +3257,7 @@ static int tun_chr_open(struct inode *inode, struct file * file) 
	tfile->socket.file = file;

	tfile->socket.ops = &tun_socket_ops;



	sock_init_data(&tfile->socket, &tfile->sk);

	sock_init_data_uid(&tfile->socket, &tfile->sk, inode->i_uid);



	tfile->sk.sk_write_space = tun_sock_write_space;

	tfile->sk.sk_sndbuf = INT_MAX;

include/net/sock.h

+6 −1
Original line number Diff line number Diff line
@@ -1686,7 +1686,12 @@ void sk_common_release(struct sock *sk); 
 *	Default socket callbacks and setup code

 */



/* Initialise core socket variables */

/* Initialise core socket variables using an explicit uid. */

void sock_init_data_uid(struct socket *sock, struct sock *sk, kuid_t uid);



/* Initialise core socket variables

 * Assumes struct socket *sock is embedded in a struct socket_alloc.

 */

void sock_init_data(struct socket *sock, struct sock *sk);



/*

net/core/sock.c

+12 −3
Original line number Diff line number Diff line
@@ -2777,7 +2777,7 @@ void sk_stop_timer(struct sock *sk, struct timer_list* timer) 
}

EXPORT_SYMBOL(sk_stop_timer);



void sock_init_data(struct socket *sock, struct sock *sk)

void sock_init_data_uid(struct socket *sock, struct sock *sk, kuid_t uid)

{

	sk_init_common(sk);

	sk->sk_send_head	=	NULL;
@@ -2796,11 +2796,10 @@ void sock_init_data(struct socket *sock, struct sock *sk) 
		sk->sk_type	=	sock->type;

		sk->sk_wq	=	sock->wq;

		sock->sk	=	sk;

		sk->sk_uid	=	SOCK_INODE(sock)->i_uid;

	} else {

		sk->sk_wq	=	NULL;

		sk->sk_uid	=	make_kuid(sock_net(sk)->user_ns, 0);

	}

	sk->sk_uid	=	uid;



	rwlock_init(&sk->sk_callback_lock);

	if (sk->sk_kern_sock)
@@ -2856,6 +2855,16 @@ void sock_init_data(struct socket *sock, struct sock *sk) 
	refcount_set(&sk->sk_refcnt, 1);

	atomic_set(&sk->sk_drops, 0);

}

EXPORT_SYMBOL(sock_init_data_uid);



void sock_init_data(struct socket *sock, struct sock *sk)

{

	kuid_t uid = sock ?

		SOCK_INODE(sock)->i_uid :

		make_kuid(sock_net(sk)->user_ns, 0);



	sock_init_data_uid(sock, sk, uid);

}

EXPORT_SYMBOL(sock_init_data);



void lock_sock_nested(struct sock *sk, int subclass)