diff options
| author | Trond Myklebust | 2008-03-19 22:59:44 +0100 |
|---|---|---|
| committer | Trond Myklebust | 2008-03-19 22:59:44 +0100 |
| commit | c7c350e92aab1bba68f26a6027b734adcf9824ba (patch) | |
| tree | aa99bd94c3049dd871d9c030d70a5f3d87591a95 /net/sctp/bind_addr.c | |
| parent | NFS: fix encode_fsinfo_maxsz (diff) | |
| parent | nfs: don't ignore return value from nfs_pageio_add_request (diff) | |
| download | kernel-qcow2-linux-c7c350e92aab1bba68f26a6027b734adcf9824ba.tar.gz kernel-qcow2-linux-c7c350e92aab1bba68f26a6027b734adcf9824ba.tar.xz kernel-qcow2-linux-c7c350e92aab1bba68f26a6027b734adcf9824ba.zip | |
Merge branch 'hotfixes' into devel
Diffstat (limited to 'net/sctp/bind_addr.c')
| -rw-r--r-- | net/sctp/bind_addr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sctp/bind_addr.c b/net/sctp/bind_addr.c index a27511ebc4cb..ceefda025e2d 100644 --- a/net/sctp/bind_addr.c +++ b/net/sctp/bind_addr.c @@ -209,6 +209,7 @@ int sctp_add_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *new, int sctp_del_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *del_addr) { struct sctp_sockaddr_entry *addr, *temp; + int found = 0; /* We hold the socket lock when calling this function, * and that acts as a writer synchronizing lock. @@ -216,13 +217,14 @@ int sctp_del_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *del_addr) list_for_each_entry_safe(addr, temp, &bp->address_list, list) { if (sctp_cmp_addr_exact(&addr->a, del_addr)) { /* Found the exact match. */ + found = 1; addr->valid = 0; list_del_rcu(&addr->list); break; } } - if (addr && !addr->valid) { + if (found) { call_rcu(&addr->rcu, sctp_local_addr_free); SCTP_DBG_OBJCNT_DEC(addr); return 0; |