| From 0d91f22b75347d9503b17a42b6c74d3f7750acd6 Mon Sep 17 00:00:00 2001 |
| From: Julia Lawall <julia@diku.dk> |
| Date: Fri, 15 Oct 2010 15:00:06 +0200 |
| Subject: drivers/net/wireless/p54/eeprom.c: Return -ENOMEM on memory allocation failure |
| |
| From: Julia Lawall <julia@diku.dk> |
| |
| commit 0d91f22b75347d9503b17a42b6c74d3f7750acd6 upstream. |
| |
| In this code, 0 is returned on memory allocation failure, even though other |
| failures return -ENOMEM or other similar values. |
| |
| A simplified version of the semantic match that finds this problem is as |
| follows: (http://coccinelle.lip6.fr/) |
| |
| // <smpl> |
| @@ |
| expression ret; |
| expression x,e1,e2,e3; |
| @@ |
| |
| ret = 0 |
| ... when != ret = e1 |
| *x = \(kmalloc\|kcalloc\|kzalloc\)(...) |
| ... when != ret = e2 |
| if (x == NULL) { ... when != ret = e3 |
| return ret; |
| } |
| // </smpl> |
| |
| Signed-off-by: Julia Lawall <julia@diku.dk> |
| Acked-by: Christian Lamparter <chunkeey@googlemail.com> |
| Signed-off-by: John W. Linville <linville@tuxdriver.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/net/wireless/p54/eeprom.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/wireless/p54/eeprom.c |
| +++ b/drivers/net/wireless/p54/eeprom.c |
| @@ -261,8 +261,10 @@ static int p54_generate_channel_lists(st |
| list->max_entries = max_channel_num; |
| list->channels = kzalloc(sizeof(struct p54_channel_entry) * |
| max_channel_num, GFP_KERNEL); |
| - if (!list->channels) |
| + if (!list->channels) { |
| + ret = -ENOMEM; |
| goto free; |
| + } |
| |
| for (i = 0; i < max_channel_num; i++) { |
| if (i < priv->iq_autocal_len) { |