From: "John W. Linville" <linville@tuxdriver•com>
To: David Miller <davem@davemloft•net>
Cc: xemul@openvz•org, johannes@sipsolutions•net, netdev@axxeo•de,
linux-wireless@vger•kernel.org, netdev@vger•kernel.org
Subject: Re: [PATCH 1/4][MAC80211]: Fix GFP_KERNEL allocation under read lock.
Date: Thu, 8 May 2008 14:51:23 -0400 [thread overview]
Message-ID: <20080508185123.GA7250@tuxdriver.com> (raw)
In-Reply-To: <20080506.225950.181623233.davem@davemloft.net>
On Tue, May 06, 2008 at 10:59:50PM -0700, David Miller wrote:
> Whether you should resubmit your patch is up to the wireless
> folks :-)
If you don't do it Ingo Oeser's way then it looks like you would need
a patch like the one below. And with the patch below, the last hunk
of your patch will probably need to be fixed-up to match.
Should I apply the patch below and wait for you to rebase and
resubmit yours?
---
From: John W. Linville <linville@tuxdriver•com>
Subject: [PATCH] mac80211 mesh: add missing check for kmalloc failure
Signed-off-by: John W. Linville <linville@tuxdriver•com>
---
net/mac80211/mesh_pathtbl.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 5845dc2..ab54f77 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -171,6 +171,12 @@ int mesh_path_add(u8 *dst, struct net_device *dev)
new_mpath->flags = 0;
skb_queue_head_init(&new_mpath->frame_queue);
new_node = kmalloc(sizeof(struct mpath_node), GFP_KERNEL);
+ if (!new_node) {
+ atomic_dec(&sdata->u.sta.mpaths);
+ kfree(new_mpath);
+ err = -ENOMEM;
+ goto endadd2;
+ }
new_node->mpath = new_mpath;
new_mpath->timer.data = (unsigned long) new_mpath;
new_mpath->timer.function = mesh_path_timer;
--
1.5.3.3
--
John W. Linville
linville@tuxdriver•com
next prev parent reply other threads:[~2008-05-08 19:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-06 14:46 [PATCH 1/4][MAC80211]: Fix GFP_KERNEL allocation under read lock Pavel Emelyanov
2008-05-06 16:40 ` Ingo Oeser
2008-05-06 17:46 ` Pavel Emelyanov
[not found] ` <4820997E.1070305-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-05-06 20:40 ` David Miller
2008-05-07 5:54 ` Pavel Emelyanov
2008-05-07 5:59 ` David Miller
2008-05-08 18:51 ` John W. Linville [this message]
[not found] ` <20080508185123.GA7250-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2008-05-08 18:53 ` John W. Linville
[not found] ` <200805061840.37713.netdev-BkyiQQGWkgE@public.gmane.org>
2008-05-06 21:12 ` Johannes Berg
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=20080508185123.GA7250@tuxdriver.com \
--to=linville@tuxdriver$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=johannes@sipsolutions$(echo .)net \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=netdev@axxeo$(echo .)de \
--cc=netdev@vger$(echo .)kernel.org \
--cc=xemul@openvz$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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