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

Commit 377cf82d authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

[RAW]: Family check in the /proc/net/raw[6] is extra. 



Different hashtables are used for IPv6 and IPv4 raw sockets, so no
need to check the socket family in the iterator over hashtables. Clean
this out.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b1641064

include/net/raw.h

+1 −3
Original line number Original line Diff line number Diff line
@@ -41,7 +41,6 @@ extern void raw_proc_exit(void); 
struct raw_iter_state {

struct raw_iter_state {

	struct seq_net_private p;

	struct seq_net_private p;

	int bucket;

	int bucket;

	unsigned short family;

	struct raw_hashinfo *h;

	struct raw_hashinfo *h;

};

};
@@ -49,8 +48,7 @@ struct raw_iter_state { 
void *raw_seq_start(struct seq_file *seq, loff_t *pos);

void *raw_seq_start(struct seq_file *seq, loff_t *pos);

void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos);

void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos);

void raw_seq_stop(struct seq_file *seq, void *v);

void raw_seq_stop(struct seq_file *seq, void *v);

int raw_seq_open(struct inode *ino, struct file *file, struct raw_hashinfo *h,

int raw_seq_open(struct inode *ino, struct file *file, struct raw_hashinfo *h);

		unsigned short family);





#endif

#endif

net/ipv4/raw.c

+4 −8
Original line number Original line Diff line number Diff line
@@ -862,8 +862,7 @@ static struct sock *raw_get_first(struct seq_file *seq) 
		struct hlist_node *node;

		struct hlist_node *node;





		sk_for_each(sk, node, &state->h->ht[state->bucket])

		sk_for_each(sk, node, &state->h->ht[state->bucket])

			if (sk->sk_net == state->p.net &&

			if (sk->sk_net == state->p.net)

					sk->sk_family == state->family)

				goto found;

				goto found;

	}

	}

	sk = NULL;

	sk = NULL;
@@ -879,8 +878,7 @@ static struct sock *raw_get_next(struct seq_file *seq, struct sock *sk) 
		sk = sk_next(sk);

		sk = sk_next(sk);

try_again:

try_again:

		;

		;

	} while (sk && sk->sk_net != state->p.net &&

	} while (sk && sk->sk_net != state->p.net);

			sk->sk_family != state->family);





	if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {

	if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {

		sk = sk_head(&state->h->ht[state->bucket]);

		sk = sk_head(&state->h->ht[state->bucket]);
@@ -974,8 +972,7 @@ static const struct seq_operations raw_seq_ops = { 
	.show  = raw_seq_show,

	.show  = raw_seq_show,

};

};





int raw_seq_open(struct inode *ino, struct file *file, struct raw_hashinfo *h,

int raw_seq_open(struct inode *ino, struct file *file, struct raw_hashinfo *h)

		unsigned short family)

{

{

	int err;

	int err;

	struct raw_iter_state *i;

	struct raw_iter_state *i;
@@ -987,14 +984,13 @@ int raw_seq_open(struct inode *ino, struct file *file, struct raw_hashinfo *h, 




	i = raw_seq_private((struct seq_file *)file->private_data);

	i = raw_seq_private((struct seq_file *)file->private_data);

	i->h = h;

	i->h = h;

	i->family = family;

	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(raw_seq_open);

EXPORT_SYMBOL_GPL(raw_seq_open);





static int raw_v4_seq_open(struct inode *inode, struct file *file)

static int raw_v4_seq_open(struct inode *inode, struct file *file)

{

{

	return raw_seq_open(inode, file, &raw_v4_hashinfo, PF_INET);

	return raw_seq_open(inode, file, &raw_v4_hashinfo);

}

}





static const struct file_operations raw_seq_fops = {

static const struct file_operations raw_seq_fops = {

net/ipv6/raw.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1262,7 +1262,7 @@ static const struct seq_operations raw6_seq_ops = { 




static int raw6_seq_open(struct inode *inode, struct file *file)

static int raw6_seq_open(struct inode *inode, struct file *file)

{

{

	return raw_seq_open(inode, file, &raw_v6_hashinfo, PF_INET6);

	return raw_seq_open(inode, file, &raw_v6_hashinfo);

}

}





static const struct file_operations raw6_seq_fops = {

static const struct file_operations raw6_seq_fops = {