diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/core/dev.c | 6 | ||||
-rw-r--r-- | net/core/dev_mcast.c | 6 | ||||
-rw-r--r-- | net/netlink/af_netlink.c | 6 | ||||
-rw-r--r-- | net/wireless/wext.c | 6 |
4 files changed, 20 insertions, 4 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index d16dcab49c60..666c112efb55 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -2464,7 +2464,11 @@ static int dev_seq_open(struct inode *inode, struct file *file) | |||
2464 | res = seq_open(file, &dev_seq_ops); | 2464 | res = seq_open(file, &dev_seq_ops); |
2465 | if (!res) { | 2465 | if (!res) { |
2466 | seq = file->private_data; | 2466 | seq = file->private_data; |
2467 | seq->private = get_net(PROC_NET(inode)); | 2467 | seq->private = get_proc_net(inode); |
2468 | if (!seq->private) { | ||
2469 | seq_release(inode, file); | ||
2470 | res = -ENXIO; | ||
2471 | } | ||
2468 | } | 2472 | } |
2469 | return res; | 2473 | return res; |
2470 | } | 2474 | } |
diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c index 1c4f6198459b..896b0ca5aed7 100644 --- a/net/core/dev_mcast.c +++ b/net/core/dev_mcast.c | |||
@@ -246,7 +246,11 @@ static int dev_mc_seq_open(struct inode *inode, struct file *file) | |||
246 | res = seq_open(file, &dev_mc_seq_ops); | 246 | res = seq_open(file, &dev_mc_seq_ops); |
247 | if (!res) { | 247 | if (!res) { |
248 | seq = file->private_data; | 248 | seq = file->private_data; |
249 | seq->private = get_net(PROC_NET(inode)); | 249 | seq->private = get_proc_net(inode); |
250 | if (!seq->private) { | ||
251 | seq_release(inode, file); | ||
252 | res = -ENXIO; | ||
253 | } | ||
250 | } | 254 | } |
251 | return res; | 255 | return res; |
252 | } | 256 | } |
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 3029f865cd61..dc9f8c2ab1d5 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
@@ -1859,7 +1859,11 @@ static int netlink_seq_open(struct inode *inode, struct file *file) | |||
1859 | 1859 | ||
1860 | seq = file->private_data; | 1860 | seq = file->private_data; |
1861 | seq->private = iter; | 1861 | seq->private = iter; |
1862 | iter->net = get_net(PROC_NET(inode)); | 1862 | iter->net = get_proc_net(inode); |
1863 | if (!iter->net) { | ||
1864 | seq_release_private(inode, file); | ||
1865 | return -ENXIO; | ||
1866 | } | ||
1863 | return 0; | 1867 | return 0; |
1864 | } | 1868 | } |
1865 | 1869 | ||
diff --git a/net/wireless/wext.c b/net/wireless/wext.c index e8b3409d6c8b..85e5f9dd0d8e 100644 --- a/net/wireless/wext.c +++ b/net/wireless/wext.c | |||
@@ -678,7 +678,11 @@ static int wireless_seq_open(struct inode *inode, struct file *file) | |||
678 | res = seq_open(file, &wireless_seq_ops); | 678 | res = seq_open(file, &wireless_seq_ops); |
679 | if (!res) { | 679 | if (!res) { |
680 | seq = file->private_data; | 680 | seq = file->private_data; |
681 | seq->private = get_net(PROC_NET(inode)); | 681 | seq->private = get_proc_net(inode); |
682 | if (!seq->private) { | ||
683 | seq_release(inode, file); | ||
684 | res = -ENXIO; | ||
685 | } | ||
682 | } | 686 | } |
683 | return res; | 687 | return res; |
684 | } | 688 | } |