Re: Receive side performance issue with multi-10-GigE and NUMA

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Neil Horman
Date: Wednesday, August 26, 2009 - 11:08 am

On Wed, Aug 26, 2009 at 07:00:13AM -0400, Neil Horman wrote:


Here  you go, I think this will fix your oops.


    Fix NULL pointer deref in skb sources ftracer
    
    Its possible that skb->sk will be null in this path, so we shouldn't just assume
    we can pass it to sock_net
    
    Signed-off-by: Neil Horman <nhorman@tuxdriver.com>

 trace_skb_sources.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel/trace/trace_skb_sources.c b/kernel/trace/trace_skb_sources.c
index 40eb071..8bf518f 100644
--- a/kernel/trace/trace_skb_sources.c
+++ b/kernel/trace/trace_skb_sources.c
@@ -29,7 +29,7 @@ static void probe_skb_dequeue(const struct sk_buff *skb, int len)
 	struct ring_buffer_event *event;
 	struct trace_skb_event *entry;
 	struct trace_array *tr = skb_trace;
-	struct net_device *dev;
+	struct net_device *dev = NULL;
 
 	if (!trace_skb_source_enabled)
 		return;
@@ -50,7 +50,9 @@ static void probe_skb_dequeue(const struct sk_buff *skb, int len)
 	entry->event_data.rx_queue = skb->queue_mapping;
 	entry->event_data.ccpu = smp_processor_id();
 
-	dev = dev_get_by_index(sock_net(skb->sk), skb->iif);
+	if (skb->sk)
+		dev = dev_get_by_index(sock_net(skb->sk), skb->iif);
+
 	if (dev) {
 		memcpy(entry->event_data.ifname, dev->name, IFNAMSIZ);
 		dev_put(dev);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Re: Receive side performance issue with multi-10-GigE and NUMA, Christoph Lameter, (Tue Aug 11, 12:15 pm)
RE: Receive side performance issue with multi-10-GigE and NUMA, Brandeburg, Jesse, (Tue Aug 11, 5:02 pm)
Re: Receive side performance issue with multi-10-GigE and NUMA, Neil Horman, (Wed Aug 26, 11:08 am)
Re: Receive side performance issue with multi-10-GigE and NUMA, Frederic Weisbecker, (Wed Aug 26, 4:46 pm)
Re: Receive side performance issue with multi-10-GigE and NUMA, Christoph Hellwig, (Wed Aug 26, 5:34 pm)
Re: Receive side performance issue with multi-10-GigE and NUMA, Christoph Hellwig, (Wed Aug 26, 5:35 pm)