Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits)
  [TIPC]: Initial activation message now includes TIPC version number
  [TIPC]: Improve response to requests for node/link information
  [TIPC]: Fixed skb_under_panic caused by tipc_link_bundle_buf
  [IrDA]: Fix the AU1000 FIR dependencies
  [IrDA]: Fix RCU lock pairing on error path
  [XFRM]: unexport xfrm_state_mtu
  [NET]: make skb_release_data() static
  [NETFILTE] ipv4: Fix typo (Bugzilla #6753)
  [IrDA]: MCS7780 usb_driver struct should be static
  [BNX2]: Turn off link during shutdown
  [BNX2]: Use dev_kfree_skb() instead of the _irq version
  [ATM]: basic sysfs support for ATM devices
  [ATM]: [suni] change suni_init to __devinit
  [ATM]: [iphase] should be __devinit not __init
  [ATM]: [idt77105] should be __devinit not __init
  [BNX2]: Add NETIF_F_TSO_ECN
  [NET]: Add ECN support for TSO
  [AF_UNIX]: Datagram getpeersec
  [NET]: Fix logical error in skb_gso_ok
  [PKT_SCHED]: PSCHED_TADD() and PSCHED_TADD2() can result,tv_usec >= 1000000
  ...

1 files changed, 17 insertions, 9 deletions

diff --git a/net/tipc/node.c b/net/tipc/node.c
index 861322b935da..fc6d09630ccd 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -2,7 +2,7 @@
  * net/tipc/node.c: TIPC node management routines
  * 
  * Copyright (c) 2000-2006, Ericsson AB
- * Copyright (c) 2005, Wind River Systems
+ * Copyright (c) 2005-2006, Wind River Systems
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -592,6 +592,7 @@ struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space)
         struct sk_buff *buf;
         struct node *n_ptr;
         struct tipc_node_info node_info;
+        u32 payload_size;
 
         if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_NET_ADDR))
                 return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
@@ -608,8 +609,11 @@ struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space)
         /* For now, get space for all other nodes 
            (will need to modify this when slave nodes are supported */
 
-        buf = tipc_cfg_reply_alloc(TLV_SPACE(sizeof(node_info)) *
-                                   (tipc_max_nodes - 1));
+        payload_size = TLV_SPACE(sizeof(node_info)) * (tipc_max_nodes - 1);
+        if (payload_size > 32768u)
+                return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
+                                                   " (too many nodes)");
+        buf = tipc_cfg_reply_alloc(payload_size);
         if (!buf)
                 return NULL;
 
@@ -633,6 +637,7 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space)
         struct sk_buff *buf;
         struct node *n_ptr;
         struct tipc_link_info link_info;
+        u32 payload_size;
 
         if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_NET_ADDR))
                 return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
@@ -645,12 +650,15 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space)
 
         if (!tipc_nodes)
                 return tipc_cfg_reply_none();
-
-        /* For now, get space for 2 links to all other nodes + bcast link 
-           (will need to modify this when slave nodes are supported */
-
-        buf = tipc_cfg_reply_alloc(TLV_SPACE(sizeof(link_info)) *
-                                   (2 * (tipc_max_nodes - 1) + 1));
+        
+        /* Get space for all unicast links + multicast link */
+
+        payload_size = TLV_SPACE(sizeof(link_info)) *
+                (tipc_net.zones[tipc_zone(tipc_own_addr)]->links + 1);
+        if (payload_size > 32768u)
+                return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
+                                                   " (too many links)");
+        buf = tipc_cfg_reply_alloc(payload_size);
         if (!buf)
                 return NULL;