From 5f4e93ca2cc7da6408422cd06b1885fd15f77495 Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Mon, 23 May 2011 13:57:25 -0400
Subject: [PATCH] --- yaml --- r: 255912 b: refs/heads/master c:
 76d12527f74ad1b42b068252fdd2056c8ae48a99 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/tipc/port.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a1bc0062ccd8..f02fe0bb3a17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acc631bf6f597b36f3f014e12e69c710da610027
+refs/heads/master: 76d12527f74ad1b42b068252fdd2056c8ae48a99
diff --git a/trunk/net/tipc/port.c b/trunk/net/tipc/port.c
index 3946b5b10c74..756e64cbff96 100644
--- a/trunk/net/tipc/port.c
+++ b/trunk/net/tipc/port.c
@@ -367,6 +367,12 @@ int tipc_reject_msg(struct sk_buff *buf, u32 err)
 		imp++;
 
 	/* discard rejected message if it shouldn't be returned to sender */
+
+	if (WARN(!msg_isdata(msg),
+		 "attempt to reject message with user=%u", msg_user(msg))) {
+		dump_stack();
+		goto exit;
+	}
 	if (msg_errcode(msg) || msg_dest_droppable(msg))
 		goto exit;