diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-12-20 18:25:08 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-21 22:14:01 +0100 |
| commit | 30e6c9fa93cf3dbc7cc6df1d748ad25e4264545a (patch) | |
| tree | e313291a178010fb892d9725cbecb326bd63fdc0 /net/core/sock.c | |
| parent | ip_gre: fix possible use after free (diff) | |
| download | linux-30e6c9fa93cf3dbc7cc6df1d748ad25e4264545a.tar.xz linux-30e6c9fa93cf3dbc7cc6df1d748ad25e4264545a.zip | |
net: devnet_rename_seq should be a seqcount
Using a seqlock for devnet_rename_seq is not a good idea,
as device_rename() can sleep.
As we hold RTNL, we dont need a protection for writers,
and only need a seqcount so that readers can catch a change done
by a writer.
Bug added in commit c91f6df2db4972d3 (sockopt: Change getsockopt() of
SO_BINDTODEVICE to return an interface name)
Reported-by: Dave Jones <davej@redhat.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Brian Haley <brian.haley@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index a692ef49c9bb..bc131d419683 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -583,7 +583,7 @@ static int sock_getbindtodevice(struct sock *sk, char __user *optval, goto out; retry: - seq = read_seqbegin(&devnet_rename_seq); + seq = read_seqcount_begin(&devnet_rename_seq); rcu_read_lock(); dev = dev_get_by_index_rcu(net, sk->sk_bound_dev_if); ret = -ENODEV; @@ -594,7 +594,7 @@ retry: strcpy(devname, dev->name); rcu_read_unlock(); - if (read_seqretry(&devnet_rename_seq, seq)) + if (read_seqcount_retry(&devnet_rename_seq, seq)) goto retry; len = strlen(devname) + 1; |