---

yaml --- r: 187941 b: refs/heads/master c: 53eecb1 h: refs/heads/master i: 187939: 0dd7aa9 v: v3
git-mirror · Mar 5, 2010 · e88cecb · e88cecb
1 parent d58eb8b
commit e88cecb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50b1a782f845140f4138f14a1ce8a4a6dd0cc82f
+refs/heads/master: 53eecb1be5ae499d399d2923933937a9ea1a284f
diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c
@@ -1322,8 +1322,10 @@ static u32 dispatch(struct tipc_port *tport, struct sk_buff *buf)
 	if (!sock_owned_by_user(sk)) {
 		res = filter_rcv(sk, buf);
 	} else {
-		sk_add_backlog(sk, buf);
-		res = TIPC_OK;
+		if (sk_add_backlog_limited(sk, buf))
+			res = TIPC_ERR_OVERLOAD;
+		else
+			res = TIPC_OK;
 	}
 	bh_unlock_sock(sk);