Re: [PATCH v2] thunderbolt: Fix to check the return value of kmemdup
From: Mika Westerberg
Date: Mon Mar 25 2019 - 05:59:25 EST
On Sat, Mar 23, 2019 at 03:20:33PM -0500, Aditya Pakki wrote:
> uuid in add_switch is allocted via kmemdup which can fail. The patch
> logs the error and cleans up the allocated memory for switch.
>
> Signed-off-by: Aditya Pakki <pakki001@xxxxxxx>
>
> ---
> v1: Change error handling from WARN_ONCE to return after clean up.
> ---
> drivers/thunderbolt/icm.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
> index e3fc920af682..be1174d86cef 100644
> --- a/drivers/thunderbolt/icm.c
> +++ b/drivers/thunderbolt/icm.c
> @@ -473,6 +473,11 @@ static void add_switch(struct tb_switch *parent_sw, u64 route,
> goto out;
>
> sw->uuid = kmemdup(uuid, sizeof(*uuid), GFP_KERNEL);
> + if (!sw->uuid) {
> + WARN_ONCE(1, "cannot allocate memory for switch\n");
Please use tb_sw_WARN() or tb_sw_warn() here instead.
> + tb_switch_put(sw);
> + goto out;
> + }
> sw->connection_id = connection_id;
> sw->connection_key = connection_key;
> sw->link = link;
> --
> 2.17.1