From ed3a37a248532367a264380762edf4757f2603f4 Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Fri, 21 Jun 2019 15:39:29 +0200
Subject: [PATCH] thor: fix crash after usb initialization failure
Registration of USB download gadget might fail for various reasons, so
add a check for g_dnl_register() funtion return value. Without this fix,
thor_init() will try to access the registered gadget structures resulting
in NULL pointer dereference issue.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
cmd/thordown.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/cmd/thordown.c b/cmd/thordown.c
index 19ae6721d1..dd0544d475 100644
--- a/cmd/thordown.c
+++ b/cmd/thordown.c
@@ -37,7 +37,11 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
goto exit;
}
- g_dnl_register("usb_dnl_thor");
+ ret = g_dnl_register("usb_dnl_thor");
+ if (ret) {
+ pr_err("g_dnl_register failed %d\n", ret);
+ return ret;
+ }
ret = thor_init();
if (ret) {
--
2.39.5