diff options
| author | Vasiliy Kulikov <segooon@gmail.com> | 2010-09-12 23:21:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-14 16:38:34 -0700 |
| commit | ff75f96bb0e9d4fc42efb66a6ccb7bf83ecc298f (patch) | |
| tree | 3c10509bd1f1a5add4f2a21f321482be7c37092b /drivers/staging/batman-adv | |
| parent | b001f71ed1ea728814175b711602e150826d13cc (diff) | |
| download | blackbird-obmc-linux-ff75f96bb0e9d4fc42efb66a6ccb7bf83ecc298f.tar.gz blackbird-obmc-linux-ff75f96bb0e9d4fc42efb66a6ccb7bf83ecc298f.zip | |
Staging: batman-adv: check kmalloc() return value
kmalloc() may fail, if so drop current packet.
Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
[sven.eckelmann@gmx.de: Removed new introduced deadlock]
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/batman-adv')
| -rw-r--r-- | drivers/staging/batman-adv/routing.c | 8 | ||||
| -rw-r--r-- | drivers/staging/batman-adv/unicast.c | 8 | ||||
| -rw-r--r-- | drivers/staging/batman-adv/unicast.h | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c index e12fd995417c..2cf8cf98a299 100644 --- a/drivers/staging/batman-adv/routing.c +++ b/drivers/staging/batman-adv/routing.c @@ -1232,8 +1232,12 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if) orig_node->last_frag_packet = jiffies; - if (list_empty(&orig_node->frag_list)) - create_frag_buffer(&orig_node->frag_list); + if (list_empty(&orig_node->frag_list) && + create_frag_buffer(&orig_node->frag_list)) { + spin_unlock_irqrestore(&bat_priv->orig_hash_lock, + flags); + return NET_RX_DROP; + } tmp_frag_entry = search_frag_packet(&orig_node->frag_list, diff --git a/drivers/staging/batman-adv/unicast.c b/drivers/staging/batman-adv/unicast.c index f951abc1afe6..0dac50d69c03 100644 --- a/drivers/staging/batman-adv/unicast.c +++ b/drivers/staging/batman-adv/unicast.c @@ -78,7 +78,7 @@ void create_frag_entry(struct list_head *head, struct sk_buff *skb) return; } -void create_frag_buffer(struct list_head *head) +int create_frag_buffer(struct list_head *head) { int i; struct frag_packet_list_entry *tfp; @@ -86,13 +86,17 @@ void create_frag_buffer(struct list_head *head) for (i = 0; i < FRAG_BUFFER_SIZE; i++) { tfp = kmalloc(sizeof(struct frag_packet_list_entry), GFP_ATOMIC); + if (!tfp) { + frag_list_free(head); + return -ENOMEM; + } tfp->skb = NULL; tfp->seqno = 0; INIT_LIST_HEAD(&tfp->list); list_add(&tfp->list, head); } - return; + return 0; } struct frag_packet_list_entry *search_frag_packet(struct list_head *head, diff --git a/drivers/staging/batman-adv/unicast.h b/drivers/staging/batman-adv/unicast.h index 1d5cbeb6733f..797369771900 100644 --- a/drivers/staging/batman-adv/unicast.h +++ b/drivers/staging/batman-adv/unicast.h @@ -30,7 +30,7 @@ struct sk_buff *merge_frag_packet(struct list_head *head, struct sk_buff *skb); void create_frag_entry(struct list_head *head, struct sk_buff *skb); -void create_frag_buffer(struct list_head *head); +int create_frag_buffer(struct list_head *head); struct frag_packet_list_entry *search_frag_packet(struct list_head *head, struct unicast_frag_packet *up); void frag_list_free(struct list_head *head); |
