diff options
author | Allan Stephens <allan.stephens@windriver.com> | 2008-06-04 20:38:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-06-04 20:38:22 -0400 |
commit | 307fdf5e7defcacf84db21cda18770b2bf5f5196 (patch) | |
tree | 09da0ae6ce3733ba53a68f907a877e2201ea1587 | |
parent | 0f15d36453bbd02d404445dace49f4ae072f44e5 (diff) |
tipc: Add missing spinlock in name table display code
This patch ensures that the display code that traverses the
publication lists belonging to a name table entry take its
associated spinlock, to protect against a possible change to
one of its "head of list" pointers caused by a simultaneous
name table lookup operation by another thread of control.
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/tipc/name_table.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c index 4455f13cfaf6..096f7bd240a0 100644 --- a/net/tipc/name_table.c +++ b/net/tipc/name_table.c | |||
@@ -74,7 +74,7 @@ struct sub_seq { | |||
74 | * @first_free: array index of first unused sub-sequence entry | 74 | * @first_free: array index of first unused sub-sequence entry |
75 | * @ns_list: links to adjacent name sequences in hash chain | 75 | * @ns_list: links to adjacent name sequences in hash chain |
76 | * @subscriptions: list of subscriptions for this 'type' | 76 | * @subscriptions: list of subscriptions for this 'type' |
77 | * @lock: spinlock controlling access to name sequence structure | 77 | * @lock: spinlock controlling access to publication lists of all sub-sequences |
78 | */ | 78 | */ |
79 | 79 | ||
80 | struct name_seq { | 80 | struct name_seq { |
@@ -918,7 +918,9 @@ static void nameseq_list(struct name_seq *seq, struct print_buf *buf, u32 depth, | |||
918 | for (sseq = seq->sseqs; sseq != &seq->sseqs[seq->first_free]; sseq++) { | 918 | for (sseq = seq->sseqs; sseq != &seq->sseqs[seq->first_free]; sseq++) { |
919 | if ((lowbound <= sseq->upper) && (upbound >= sseq->lower)) { | 919 | if ((lowbound <= sseq->upper) && (upbound >= sseq->lower)) { |
920 | tipc_printf(buf, "%s ", typearea); | 920 | tipc_printf(buf, "%s ", typearea); |
921 | spin_lock_bh(&seq->lock); | ||
921 | subseq_list(sseq, buf, depth, index); | 922 | subseq_list(sseq, buf, depth, index); |
923 | spin_unlock_bh(&seq->lock); | ||
922 | sprintf(typearea, "%10s", " "); | 924 | sprintf(typearea, "%10s", " "); |
923 | } | 925 | } |
924 | } | 926 | } |