From: Joe Hershberger <joe.hershberger@ni.com>
Date: Tue, 18 Sep 2012 10:01:32 +0000 (+0000)
Subject: net: Filter incoming netconsole packets by IP
X-Git-Tag: v2012.10-rc2~12^2~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8a0eccb1056b313b45ab62e3aac400f339aa71b4;p=oweals%2Fu-boot.git

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 63ce73c818..dd7032af56 100644
--- 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 e193b7b60b..35393366d3 100644
--- 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 a89946ebe0..809fb14c79 100644
--- 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);