Commit 09024688 authored by Cong Ding's avatar Cong Ding Committed by Greg Kroah-Hartman

staging: echo.c: fix memory leakage

we should check the return value of calling function fir16_create(): a NULL
value means the memory allocation fails.

this patch also cleans up the error handling in function function oslec_create()
Signed-off-by: default avatarCong Ding <dinggnu@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78855c7a
...@@ -229,6 +229,7 @@ struct oslec_state *oslec_create(int len, int adaption_mode) ...@@ -229,6 +229,7 @@ struct oslec_state *oslec_create(int len, int adaption_mode)
{ {
struct oslec_state *ec; struct oslec_state *ec;
int i; int i;
const int16_t *history;
ec = kzalloc(sizeof(*ec), GFP_KERNEL); ec = kzalloc(sizeof(*ec), GFP_KERNEL);
if (!ec) if (!ec)
...@@ -238,15 +239,22 @@ struct oslec_state *oslec_create(int len, int adaption_mode) ...@@ -238,15 +239,22 @@ struct oslec_state *oslec_create(int len, int adaption_mode)
ec->log2taps = top_bit(len); ec->log2taps = top_bit(len);
ec->curr_pos = ec->taps - 1; ec->curr_pos = ec->taps - 1;
for (i = 0; i < 2; i++) { ec->fir_taps16[0] =
ec->fir_taps16[i] =
kcalloc(ec->taps, sizeof(int16_t), GFP_KERNEL); kcalloc(ec->taps, sizeof(int16_t), GFP_KERNEL);
if (!ec->fir_taps16[i]) if (!ec->fir_taps16[0])
goto error_oom; goto error_oom_0;
}
ec->fir_taps16[1] =
kcalloc(ec->taps, sizeof(int16_t), GFP_KERNEL);
if (!ec->fir_taps16[1])
goto error_oom_1;
fir16_create(&ec->fir_state, ec->fir_taps16[0], ec->taps); history = fir16_create(&ec->fir_state, ec->fir_taps16[0], ec->taps);
fir16_create(&ec->fir_state_bg, ec->fir_taps16[1], ec->taps); if (!history)
goto error_state;
history = fir16_create(&ec->fir_state_bg, ec->fir_taps16[1], ec->taps);
if (!history)
goto error_state_bg;
for (i = 0; i < 5; i++) for (i = 0; i < 5; i++)
ec->xvtx[i] = ec->yvtx[i] = ec->xvrx[i] = ec->yvrx[i] = 0; ec->xvtx[i] = ec->yvtx[i] = ec->xvrx[i] = ec->yvrx[i] = 0;
...@@ -256,7 +264,7 @@ struct oslec_state *oslec_create(int len, int adaption_mode) ...@@ -256,7 +264,7 @@ struct oslec_state *oslec_create(int len, int adaption_mode)
ec->snapshot = kcalloc(ec->taps, sizeof(int16_t), GFP_KERNEL); ec->snapshot = kcalloc(ec->taps, sizeof(int16_t), GFP_KERNEL);
if (!ec->snapshot) if (!ec->snapshot)
goto error_oom; goto error_snap;
ec->cond_met = 0; ec->cond_met = 0;
ec->Pstates = 0; ec->Pstates = 0;
...@@ -269,10 +277,15 @@ struct oslec_state *oslec_create(int len, int adaption_mode) ...@@ -269,10 +277,15 @@ struct oslec_state *oslec_create(int len, int adaption_mode)
return ec; return ec;
error_oom: error_snap:
for (i = 0; i < 2; i++) fir16_free(&ec->fir_state_bg);
kfree(ec->fir_taps16[i]); error_state_bg:
fir16_free(&ec->fir_state);
error_state:
kfree(ec->fir_taps16[1]);
error_oom_1:
kfree(ec->fir_taps16[0]);
error_oom_0:
kfree(ec); kfree(ec);
return NULL; return NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment