* [PATCH v2] thunderbolt: Fix to check the return value of kmemdup
@ 2019-03-23 20:20 Aditya Pakki
2019-03-25 9:59 ` Mika Westerberg
0 siblings, 1 reply; 2+ messages in thread
From: Aditya Pakki @ 2019-03-23 20:20 UTC (permalink / raw)
To: pakki001
Cc: kjlu, Andreas Noever, Michael Jamet, Mika Westerberg,
Yehezkel Bernat, linux-kernel
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@umn.edu>
---
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");
+ tb_switch_put(sw);
+ goto out;
+ }
sw->connection_id = connection_id;
sw->connection_key = connection_key;
sw->link = link;
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] thunderbolt: Fix to check the return value of kmemdup
2019-03-23 20:20 [PATCH v2] thunderbolt: Fix to check the return value of kmemdup Aditya Pakki
@ 2019-03-25 9:59 ` Mika Westerberg
0 siblings, 0 replies; 2+ messages in thread
From: Mika Westerberg @ 2019-03-25 9:59 UTC (permalink / raw)
To: Aditya Pakki
Cc: kjlu, Andreas Noever, Michael Jamet, Yehezkel Bernat, linux-kernel
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@umn.edu>
>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-25 9:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-23 20:20 [PATCH v2] thunderbolt: Fix to check the return value of kmemdup Aditya Pakki
2019-03-25 9:59 ` Mika Westerberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).