netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Dumazet <dada1@cosmosbay.com>
To: David Miller <davem@davemloft.net>
Cc: Robert Olsson <Robert.Olsson@data.slu.se>, netdev@vger.kernel.org
Subject: [FIB]: Avoid using static variables without proper locking
Date: Mon, 14 Jan 2008 20:27:11 +0100	[thread overview]
Message-ID: <478BB78F.8060609@cosmosbay.com> (raw)
In-Reply-To: <18315.41725.417992.715140@robur.slu.se>

[-- Attachment #1: Type: text/plain, Size: 287 bytes --]

fib_trie_seq_show() uses two helper functions, rtn_scope() and 
rtn_type() that can
write to static storage without locking.

Just pass to them a temporary buffer to avoid potential  corruption
(probably not triggerable but still...)

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>



[-- Attachment #2: fib_trie.patch --]
[-- Type: text/plain, Size: 1936 bytes --]

diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 8d8c291..15a555a 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -2276,10 +2276,8 @@ static void seq_indent(struct seq_file *seq, int n)
 	while (n-- > 0) seq_puts(seq, "   ");
 }
 
-static inline const char *rtn_scope(enum rt_scope_t s)
+static inline const char *rtn_scope(char *buf, size_t len, enum rt_scope_t s)
 {
-	static char buf[32];
-
 	switch (s) {
 	case RT_SCOPE_UNIVERSE: return "universe";
 	case RT_SCOPE_SITE:	return "site";
@@ -2287,7 +2285,7 @@ static inline const char *rtn_scope(enum rt_scope_t s)
 	case RT_SCOPE_HOST:	return "host";
 	case RT_SCOPE_NOWHERE:	return "nowhere";
 	default:
-		snprintf(buf, sizeof(buf), "scope=%d", s);
+		snprintf(buf, len, "scope=%d", s);
 		return buf;
 	}
 }
@@ -2307,13 +2305,11 @@ static const char *rtn_type_names[__RTN_MAX] = {
 	[RTN_XRESOLVE] = "XRESOLVE",
 };
 
-static inline const char *rtn_type(unsigned t)
+static inline const char *rtn_type(char *buf, size_t len, unsigned t)
 {
-	static char buf[32];
-
 	if (t < __RTN_MAX && rtn_type_names[t])
 		return rtn_type_names[t];
-	snprintf(buf, sizeof(buf), "type %d", t);
+	snprintf(buf, len, "type %d", t);
 	return buf;
 }
 
@@ -2351,13 +2347,19 @@ static int fib_trie_seq_show(struct seq_file *seq, void *v)
 		seq_printf(seq, "  |-- %d.%d.%d.%d\n", NIPQUAD(val));
 		for (i = 32; i >= 0; i--) {
 			struct leaf_info *li = find_leaf_info(l, i);
+
 			if (li) {
 				struct fib_alias *fa;
+
 				list_for_each_entry_rcu(fa, &li->falh, fa_list) {
+					char buf1[32], buf2[32];
+
 					seq_indent(seq, iter->depth+1);
 					seq_printf(seq, "  /%d %s %s", i,
-						   rtn_scope(fa->fa_scope),
-						   rtn_type(fa->fa_type));
+						   rtn_scope(buf1, sizeof(buf1),
+							     fa->fa_scope),
+						   rtn_type(buf2, sizeof(buf2),
+							     fa->fa_type));
 					if (fa->fa_tos)
 						seq_printf(seq, "tos =%d\n",
 							   fa->fa_tos);

  reply	other threads:[~2008-01-14 19:27 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20080112064513.803976049@linux-foundation.org>
     [not found] ` <20080112064646.056241123@linux-foundation.org>
2008-01-13  4:49   ` [PATCH 1/9] get rid of trie_init David Miller
     [not found] ` <20080112064646.132747871@linux-foundation.org>
2008-01-13  4:50   ` [PATCH 2/9] get rid of unused revision element David Miller
2008-01-14 11:44     ` Robert Olsson
2008-01-14 12:06       ` David Miller
2008-01-14 16:35         ` Stephen Hemminger
2008-01-15  7:07           ` David Miller
     [not found] ` <20080112064646.207183428@linux-foundation.org>
2008-01-13  4:53   ` [PATCH 3/9] move size information to pr_debug() David Miller
     [not found] ` <20080112064646.282104074@linux-foundation.org>
2008-01-13  4:55   ` [PATCH 4/9] statistics improvements David Miller
2008-01-13  5:33     ` Stephen Hemminger
2008-01-13  5:44       ` David Miller
2008-01-14 20:57         ` [PATCH] [IPV4] fib_trie: size and statistics Stephen Hemminger
     [not found]           ` <20080114164450.55f8c9b2@deepthought>
2008-01-15  0:46             ` [PATCH 3/6] [IPV4] trie: put leaf nodes in a slab cache Stephen Hemminger
2008-01-15  0:47               ` [PATCH 4/6] [IPV4] fib_trie style cleanup Stephen Hemminger
2008-01-15  2:58                 ` [PATCH 5/6] [IPV4] fib_trie: checkleaf calling convention Stephen Hemminger
2008-01-15  5:07                   ` [RFC 6/6] fib_trie: combine leaf and info Stephen Hemminger
2008-01-15  6:12                     ` Eric Dumazet
2008-01-15  6:16                       ` Eric Dumazet
2008-01-15 16:19                         ` Stephen Hemminger
2008-01-15 16:44                           ` Robert Olsson
2008-01-15 17:25                             ` Eric Dumazet
2008-01-15 17:47                               ` Stephen Hemminger
2008-01-15 18:10                                 ` Eric Dumazet
2008-01-15 18:15                                   ` Stephen Hemminger
2008-01-15 18:32                                     ` Eric Dumazet
2008-01-15 20:18                                 ` Robert Olsson
2008-01-15 21:16                                   ` Eric Dumazet
2008-01-15 17:59                               ` Robert Olsson
2008-01-15  6:49               ` [PATCH 3/6] [IPV4] trie: put leaf nodes in a slab cache Eric Dumazet
2008-01-15  7:29               ` David Miller
2008-01-15  5:00           ` [PATCH 2/6] [IPV4] fib hash|trie initialization Stephen Hemminger
2008-01-15  7:14             ` David Miller
2008-01-15  6:55           ` [PATCH] [IPV4] fib_trie: size and statistics Eric Dumazet
2008-01-15  7:28             ` David Miller
2008-01-15  7:12           ` David Miller
     [not found] ` <20080112064646.356466158@linux-foundation.org>
2008-01-13  4:56   ` [PATCH 5/9] use %u for unsigned printfs David Miller
     [not found] ` <20080112064646.432200237@linux-foundation.org>
2008-01-13  4:57   ` [PATCH 6/9] : fib_insert_node cleanup David Miller
     [not found] ` <20080112064646.507015655@linux-foundation.org>
2008-01-13  4:58   ` [PATCH 7/9] printk related cleanups David Miller
     [not found] ` <20080112064646.583836190@linux-foundation.org>
2008-01-13  5:23   ` [PATCH 8/9] add statistics David Miller
     [not found] ` <20080112064646.659443238@linux-foundation.org>
2008-01-12 11:16   ` [PATCH 9/9] fix sparse warnings Eric Dumazet
2008-01-12 11:28     ` David Miller
2008-01-12 21:08     ` Stephen Hemminger
2008-01-14 11:07       ` Robert Olsson
2008-01-14 17:34         ` Eric Dumazet
2008-01-14 17:59           ` Robert Olsson
2008-01-14 19:27             ` Eric Dumazet [this message]
2008-01-15  7:10               ` [FIB]: Avoid using static variables without proper locking David Miller
2008-01-12 21:09     ` [PATCH 9/9] fix sparse warnings Stephen Hemminger
2008-01-13  5:28       ` David Miller
2008-01-13 18:30     ` [FIB]: full_children & empty_children should be uint, not ushort Eric Dumazet
2008-01-13 22:02       ` Robert Olsson
2008-01-14  6:32         ` David Miller
2008-01-13  5:25   ` [PATCH 9/9] fix sparse warnings David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=478BB78F.8060609@cosmosbay.com \
    --to=dada1@cosmosbay.com \
    --cc=Robert.Olsson@data.slu.se \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).