net: Filter incoming netconsole packets by IP

Check the incoming packets' source IP address... if ncip isn't set to a
broadcast address, only listen to the client at ncip.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 63ce73c81891004594e4b1ff42e3ef935b8f671d..dd7032af56cba2680fde59bfb49b9d8281af59ec 100644 (file)
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -147,13 +147,17 @@ void NcStart(void)
        }
 }
 
-int nc_input_packet(uchar *pkt, unsigned dest, unsigned src, unsigned len)
+int nc_input_packet(uchar *pkt, IPaddr_t src_ip, unsigned dest_port,
+       unsigned src_port, unsigned len)
 {
        int end, chunk;
 
-       if (dest != nc_in_port || !len)
+       if (dest_port != nc_in_port || !len)
                return 0; /* not for us */
 
+       if (src_ip != nc_ip && !is_broadcast(nc_ip))
+               return 0; /* not from our client */
+
        debug_cond(DEBUG_DEV_PKT, "input: \"%*.*s\"\n", len, len, pkt);
 
        if (input_size == sizeof(input_buffer))

diff --git a/include/net.h b/include/net.h
index e193b7b60bd65eedcee9f78a1679c15eb9ebd46c..35393366d333b5143aefff3bd3dac7898b0c7b47 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -549,7 +549,8 @@ extern void NetReceive(uchar *, int);
 
 #ifdef CONFIG_NETCONSOLE
 void NcStart(void);
-int nc_input_packet(uchar *pkt, unsigned dest, unsigned src, unsigned len);
+int nc_input_packet(uchar *pkt, IPaddr_t src_ip, unsigned dest_port,
+       unsigned src_port, unsigned len);
 #endif
 
 static inline __attribute__((always_inline)) int eth_is_on_demand_init(void)

diff --git a/net/net.c b/net/net.c
index a89946ebe0625bea3bf943e20b04d47f069ec93d..809fb14c7955154ab7e9b8298c9142af876de2f7 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -1161,6 +1161,7 @@ NetReceive(uchar *inpkt, int len)
 
 #ifdef CONFIG_NETCONSOLE
                nc_input_packet((uchar *)ip + IP_UDP_HDR_SIZE,
+                                       ntohl(ip->ip_src),
                                        ntohs(ip->udp_dst),
                                        ntohs(ip->udp_src),
                                        ntohs(ip->udp_len) - UDP_HDR_SIZE);