From: Brian Haley <brian.haley@hp.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, containers <containers@lists.osdl.org>
Subject: [PATCH 1/2] netns: fix NULL-dereference in dev_net()
Date: Thu, 14 Aug 2008 15:27:25 -0400 [thread overview]
Message-ID: <48A4871D.1030708@hp.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 133 bytes --]
Change dev_net() to handle a NULL argument - return &init_net instead.
-Brian
Signed-off-by: Brian Haley <brian.haley@hp.com>
---
[-- Attachment #2: dev_net1.patch --]
[-- Type: text/x-patch, Size: 405 bytes --]
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 488c56e..baf6517 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -781,10 +781,10 @@ static inline
struct net *dev_net(const struct net_device *dev)
{
#ifdef CONFIG_NET_NS
- return dev->nd_net;
-#else
- return &init_net;
+ if (dev)
+ return dev->nd_net;
#endif
+ return &init_net;
}
static inline
next reply other threads:[~2008-08-14 19:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-14 19:27 Brian Haley [this message]
2008-08-14 19:55 ` [Devel] [PATCH 1/2] netns: fix NULL-dereference in dev_net() Alexey Dobriyan
2008-08-14 20:01 ` Brian Haley
2008-08-14 20:20 ` Denis V. Lunev
2008-08-14 20:29 ` Brian Haley
2008-08-16 21:30 ` Daniel Lezcano
2008-08-17 22:34 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48A4871D.1030708@hp.com \
--to=brian.haley@hp.com \
--cc=containers@lists.osdl.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).