Commit 1bf40954 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller

[PACKET]: Fix /proc/net/packet crash due to bogus private pointer

The seq_open_net patch changed the meaning of seq->private.
Unfortunately it missed two spots in AF_PACKET, which still
used the old way of dereferencing seq->private, thus causing
weird and wonderful crashes when reading /proc/net/packet.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d4d2980
...@@ -1878,7 +1878,7 @@ static void *packet_seq_start(struct seq_file *seq, loff_t *pos) ...@@ -1878,7 +1878,7 @@ static void *packet_seq_start(struct seq_file *seq, loff_t *pos)
static void *packet_seq_next(struct seq_file *seq, void *v, loff_t *pos) static void *packet_seq_next(struct seq_file *seq, void *v, loff_t *pos)
{ {
struct net *net = seq->private; struct net *net = seq_file_net(seq);
++*pos; ++*pos;
return (v == SEQ_START_TOKEN) return (v == SEQ_START_TOKEN)
? sk_head(&net->packet.sklist) ? sk_head(&net->packet.sklist)
...@@ -1887,7 +1887,7 @@ static void *packet_seq_next(struct seq_file *seq, void *v, loff_t *pos) ...@@ -1887,7 +1887,7 @@ static void *packet_seq_next(struct seq_file *seq, void *v, loff_t *pos)
static void packet_seq_stop(struct seq_file *seq, void *v) static void packet_seq_stop(struct seq_file *seq, void *v)
{ {
struct net *net = seq->private; struct net *net = seq_file_net(seq);
read_unlock(&net->packet.sklist_lock); read_unlock(&net->packet.sklist_lock);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment