diff options
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 10 | ||||
| -rw-r--r-- | net/ipv4/udp.c | 7 |
2 files changed, 6 insertions, 11 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 0e9bc120707d..cd601a866c2f 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
| @@ -2214,9 +2214,6 @@ static int tcp_seq_open(struct inode *inode, struct file *file) | |||
| 2214 | struct tcp_iter_state *s; | 2214 | struct tcp_iter_state *s; |
| 2215 | int err; | 2215 | int err; |
| 2216 | 2216 | ||
| 2217 | if (unlikely(afinfo == NULL)) | ||
| 2218 | return -EINVAL; | ||
| 2219 | |||
| 2220 | err = seq_open_net(inode, file, &afinfo->seq_ops, | 2217 | err = seq_open_net(inode, file, &afinfo->seq_ops, |
| 2221 | sizeof(struct tcp_iter_state)); | 2218 | sizeof(struct tcp_iter_state)); |
| 2222 | if (err < 0) | 2219 | if (err < 0) |
| @@ -2241,10 +2238,9 @@ int tcp_proc_register(struct net *net, struct tcp_seq_afinfo *afinfo) | |||
| 2241 | afinfo->seq_ops.next = tcp_seq_next; | 2238 | afinfo->seq_ops.next = tcp_seq_next; |
| 2242 | afinfo->seq_ops.stop = tcp_seq_stop; | 2239 | afinfo->seq_ops.stop = tcp_seq_stop; |
| 2243 | 2240 | ||
| 2244 | p = proc_net_fops_create(net, afinfo->name, S_IRUGO, &afinfo->seq_fops); | 2241 | p = proc_create_data(afinfo->name, S_IRUGO, net->proc_net, |
| 2245 | if (p) | 2242 | &afinfo->seq_fops, afinfo); |
| 2246 | p->data = afinfo; | 2243 | if (!p) |
| 2247 | else | ||
| 2248 | rc = -ENOMEM; | 2244 | rc = -ENOMEM; |
| 2249 | return rc; | 2245 | return rc; |
| 2250 | } | 2246 | } |
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 1f535e315188..db1cb7c96d63 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
| @@ -1605,10 +1605,9 @@ int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo) | |||
| 1605 | afinfo->seq_ops.next = udp_seq_next; | 1605 | afinfo->seq_ops.next = udp_seq_next; |
| 1606 | afinfo->seq_ops.stop = udp_seq_stop; | 1606 | afinfo->seq_ops.stop = udp_seq_stop; |
| 1607 | 1607 | ||
| 1608 | p = proc_net_fops_create(net, afinfo->name, S_IRUGO, &afinfo->seq_fops); | 1608 | p = proc_create_data(afinfo->name, S_IRUGO, net->proc_net, |
| 1609 | if (p) | 1609 | &afinfo->seq_fops, afinfo); |
| 1610 | p->data = afinfo; | 1610 | if (!p) |
| 1611 | else | ||
| 1612 | rc = -ENOMEM; | 1611 | rc = -ENOMEM; |
| 1613 | return rc; | 1612 | return rc; |
| 1614 | } | 1613 | } |
