From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, Allan.Stephens@windriver.com,
Allan Stephens <allan.stephens@windriver.com>,
Paul Gortmaker <paul.gortmaker@windriver.com>
Subject: [PATCH net-next 01/20] tipc: Convert fatal broadcast sanity check to non-fatal check
Date: Fri, 24 Jun 2011 18:07:08 -0400 [thread overview]
Message-ID: <1308953247-25266-2-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1308953247-25266-1-git-send-email-paul.gortmaker@windriver.com>
From: Allan Stephens <allan.stephens@windriver.com>
Modifies the existing broadcast link sanity check that detects an
attempt to send a message off-node when there are no available
destinations so that it no longer causes a kernel panic; instead,
the check now issues a warning and stack trace and then returns
without sending the message anywhere.
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
net/tipc/bcast.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index fa68d1e..759b318 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -552,12 +552,16 @@ static int tipc_bcbearer_send(struct sk_buff *buf,
if (likely(!msg_non_seq(buf_msg(buf)))) {
struct tipc_msg *msg;
- assert(tipc_bcast_nmap.count != 0);
bcbuf_set_acks(buf, tipc_bcast_nmap.count);
msg = buf_msg(buf);
msg_set_non_seq(msg, 1);
msg_set_mc_netid(msg, tipc_net_id);
bcl->stats.sent_info++;
+
+ if (WARN_ON(!tipc_bcast_nmap.count)) {
+ dump_stack();
+ return 0;
+ }
}
/* Send buffer over bearers until all targets reached */
--
1.7.4.4
next prev parent reply other threads:[~2011-06-24 22:07 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-24 22:07 [PATCH net-next 00/20] misc tipc updates / enhancements Paul Gortmaker
2011-06-24 22:07 ` Paul Gortmaker [this message]
2011-06-24 22:07 ` [PATCH net-next 02/20] tipc: Remove unused sanity test macro Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 03/20] tipc: Standardize exit logic for message rejection handling Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 04/20] tipc: Add sanity check to detect rejection of non-payload messages Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 05/20] tipc: Optimize routing of returned payload messages Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 06/20] tipc: Optimizations & corrections to message rejection Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 07/20] tipc: Eliminate message header routines for caching destination node Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 08/20] tipc: Eliminate redundant masking in message header routines Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 09/20] tipc: Partition name table instance array info into two parts Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 10/20] tipc: Convert name table publication lists to standard kernel lists Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 11/20] tipc: Eliminate checks for empty zone list during name translation Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 12/20] tipc: Correct typo in link statistics output Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 13/20] tipc: Eliminate unused field in bearer structure Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 14/20] tipc: Remove unnecessary includes in socket code Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 15/20] tipc: Eliminate useless check when creating internal message Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 16/20] tipc: Cleanup of message header size terminology Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 17/20] tipc: Optimize creation of FIN messages Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 18/20] tipc: Reject connection protocol message sent to unconnected port Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 19/20] tipc: Don't create payload message using connection protocol routine Paul Gortmaker
2011-06-24 22:07 ` [PATCH net-next 20/20] tipc: Optimize creation of connection protocol messages Paul Gortmaker
2011-06-24 23:55 ` [PATCH net-next 00/20] misc tipc updates / enhancements 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=1308953247-25266-2-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=Allan.Stephens@windriver.com \
--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