From f7df4abffe09718eb68b105624c9952851cd646b Mon Sep 17 00:00:00 2001 From: Krishna Kurapati Date: Wed, 11 Aug 2021 23:47:41 +0530 Subject: [PATCH] usb: gadget: gsi: Avoid accessing an uninitialized variable Prevent dereferencing an uninitialized f_gsi pointer. Return a valid gsi context only after finding a valid gsi_opts instance. Else return NULL. Change-Id: I75578c0bc3f4673ec66cb80bcb7a6ae328489253 Signed-off-by: Krishna Kurapati --- drivers/usb/gadget/function/f_gsi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/gadget/function/f_gsi.c b/drivers/usb/gadget/function/f_gsi.c index 687c6a2a96b5..696eba43e0b5 100644 --- a/drivers/usb/gadget/function/f_gsi.c +++ b/drivers/usb/gadget/function/f_gsi.c @@ -207,11 +207,11 @@ static struct f_gsi *get_connected_gsi(void) int i; for (i = 0; i < IPA_USB_MAX_TETH_PROT_SIZE; i++) { - if (inst_status[i].opts) + if (inst_status[i].opts) { connected_gsi = inst_status[i].opts->gsi; - - if (connected_gsi && atomic_read(&connected_gsi->connected)) - return connected_gsi; + if (connected_gsi && atomic_read(&connected_gsi->connected)) + return connected_gsi; + } } return NULL;