diff options
| author |   Simon Wunderlich <siwu@hrz.tu-chemnitz.de> | 2010-01-02 11:30:47 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-03 16:42:35 -0800 |
| commit | c4bf05d3960981a4291bcc9580f3d73eb4dcbe84 (patch) | |
| tree | 9d9f214988a259ba96f522ee65e741cec1b9bef9 /drivers/staging/batman-adv/translation-table.c | |
| parent | Staging: batman-adv: splitting /proc vis file into vis_server and vis_data (diff) | |
| download | linux-dev-c4bf05d3960981a4291bcc9580f3d73eb4dcbe84.tar.xz linux-dev-c4bf05d3960981a4291bcc9580f3d73eb4dcbe84.zip | |
Staging: batman-adv: check all kmalloc()s
there are some kmallocs left which are not checked whether they succeeds or
not, which might lead to corrupted data structures if the system memory is
full. This patch should clean up the remaining unchecked kmalloc()s.
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/batman-adv/translation-table.c')
| -rw-r--r-- | drivers/staging/batman-adv/translation-table.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/staging/batman-adv/translation-table.c b/drivers/staging/batman-adv/translation-table.c index 088715ba8dbd..8c8136b71628 100644 --- a/drivers/staging/batman-adv/translation-table.c +++ b/drivers/staging/batman-adv/translation-table.c @@ -317,14 +317,16 @@ void hna_global_add_orig(struct orig_node *orig_node, hna_buff_count++; } - orig_node->hna_buff_len = hna_buff_len; - - if (orig_node->hna_buff_len > 0) { - orig_node->hna_buff = kmalloc(orig_node->hna_buff_len, - GFP_ATOMIC); - memcpy(orig_node->hna_buff, hna_buff, orig_node->hna_buff_len); - } else { - orig_node->hna_buff = NULL; + /* initialize, and overwrite if malloc succeeds */ + orig_node->hna_buff = NULL; + orig_node->hna_buff_len = 0; + + if (hna_buff_len > 0) { + orig_node->hna_buff = kmalloc(hna_buff_len, GFP_ATOMIC); + if (orig_node->hna_buff) { + memcpy(orig_node->hna_buff, hna_buff, hna_buff_len); + orig_node->hna_buff_len = hna_buff_len; + } } spin_lock_irqsave(&hna_global_hash_lock, flags); |