usb: typec: ucsi: huawei_gaokun: add error checking

[PATCH] usb: typec: ucsi: huawei_gaokun: add error checking

Posted by Pengyu Luo 10 months ago

'cci' may be uninitialized, adding error checking to fix it.

Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/all/Z_44zoTyLLdXNkKT@stanley.mountain
Fixes: 00327d7f2c8c ("usb: typec: ucsi: add Huawei Matebook E Go ucsi driver")
Signed-off-by: Pengyu Luo <mitltlatltl@gmail.com>
---
 drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c b/drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c
index 344aa7aeaf..7b5222081b 100644
--- a/drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c
+++ b/drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c
@@ -359,6 +359,7 @@ static int gaokun_ucsi_notify(struct notifier_block *nb,
 			      unsigned long action, void *data)
 {
 	u32 cci;
+	int ret;
 	struct gaokun_ucsi *uec = container_of(nb, struct gaokun_ucsi, nb);
 
 	switch (action) {
@@ -368,7 +369,10 @@ static int gaokun_ucsi_notify(struct notifier_block *nb,
 		return NOTIFY_OK;
 
 	case EC_EVENT_UCSI:
-		gaokun_ucsi_read_cci(uec->ucsi, &cci);
+		ret = gaokun_ucsi_read_cci(uec->ucsi, &cci);
+		if (ret)
+			return NOTIFY_DONE;
+
 		ucsi_notify_common(uec->ucsi, cci);
 		if (UCSI_CCI_CONNECTOR(cci))
 			gaokun_ucsi_handle_no_usb_event(uec, UCSI_CCI_CONNECTOR(cci) - 1);
-- 
2.49.0

Re: [PATCH] usb: typec: ucsi: huawei_gaokun: add error checking

Posted by Heikki Krogerus 9 months, 4 weeks ago

On Wed, Apr 16, 2025 at 01:20:05AM +0800, Pengyu Luo wrote:
> 'cci' may be uninitialized, adding error checking to fix it.
> 
> Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
> Closes: https://lore.kernel.org/all/Z_44zoTyLLdXNkKT@stanley.mountain
> Fixes: 00327d7f2c8c ("usb: typec: ucsi: add Huawei Matebook E Go ucsi driver")
> Signed-off-by: Pengyu Luo <mitltlatltl@gmail.com>

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

> ---
>  drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c b/drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c
> index 344aa7aeaf..7b5222081b 100644
> --- a/drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c
> +++ b/drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c
> @@ -359,6 +359,7 @@ static int gaokun_ucsi_notify(struct notifier_block *nb,
>  			      unsigned long action, void *data)
>  {
>  	u32 cci;
> +	int ret;
>  	struct gaokun_ucsi *uec = container_of(nb, struct gaokun_ucsi, nb);
>  
>  	switch (action) {
> @@ -368,7 +369,10 @@ static int gaokun_ucsi_notify(struct notifier_block *nb,
>  		return NOTIFY_OK;
>  
>  	case EC_EVENT_UCSI:
> -		gaokun_ucsi_read_cci(uec->ucsi, &cci);
> +		ret = gaokun_ucsi_read_cci(uec->ucsi, &cci);
> +		if (ret)
> +			return NOTIFY_DONE;
> +
>  		ucsi_notify_common(uec->ucsi, cci);
>  		if (UCSI_CCI_CONNECTOR(cci))
>  			gaokun_ucsi_handle_no_usb_event(uec, UCSI_CCI_CONNECTOR(cci) - 1);
> -- 
> 2.49.0

-- 
heikki