diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-04-02 03:57:43 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-04-02 03:57:43 -0700 |
| commit | 6a214b82afd7003b84fbfbd2754693ce294c6be4 (patch) | |
| tree | c3e43b340a504be9492f1d8d21e92b4e9cb02b12 /net/unix/diag.c | |
| parent | 6e016ebde6389f290650d76181d96e4894ff1351 (diff) | |
| parent | 19342ee004a99ae621daba6ae960a243abc7f7ed (diff) | |
Merge "Merge android-4.4.177 (0c3b8c4) into msm-4.4"
Diffstat (limited to 'net/unix/diag.c')
| -rw-r--r-- | net/unix/diag.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/unix/diag.c b/net/unix/diag.c index 384c84e83462..3183d9b8ab33 100644 --- a/net/unix/diag.c +++ b/net/unix/diag.c @@ -10,7 +10,8 @@ static int sk_diag_dump_name(struct sock *sk, struct sk_buff *nlskb) { - struct unix_address *addr = unix_sk(sk)->addr; + /* might or might not have unix_table_lock */ + struct unix_address *addr = smp_load_acquire(&unix_sk(sk)->addr); if (!addr) return 0; |