phy: realtek: usb: add the error handler for nvmem_cell_read
authorStanley Chang <stanley_chang@realtek.com>
Tue, 1 Aug 2023 07:14:52 +0000 (15:14 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 Aug 2023 12:47:18 +0000 (14:47 +0200)
There are following smatch warning:
drivers/phy/realtek/phy-rtk-usb2.c:901 get_phy_data_by_efuse()
error: 'buf' dereferencing possible ERR_PTR()
drivers/phy/realtek/phy-rtk-usb2.c:942 get_phy_data_by_efuse()
error: 'buf' dereferencing possible ERR_PTR()

drivers/phy/realtek/phy-rtk-usb3.c:460
get_phy_data_by_efuse() error: 'buf' dereferencing possible ERR_PTR()

The nvmem_cell_read may fail to read. So, driver must handle failure cases.

Fixes: 134e6d25f6bd ("phy: realtek: usb: Add driver for the Realtek SoC USB 2.0 PHY")
Fixes: adda6e82a7de ("phy: realtek: usb: Add driver for the Realtek SoC USB 3.0 PHY")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/linux-phy/e7ff2870-c30c-4d8d-a7a9-d2d6a4962eb5@kadam.mountain/
Signed-off-by: Stanley Chang <stanley_chang@realtek.com>
Link: https://lore.kernel.org/r/20230801071509.20096-1-stanley_chang@realtek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/phy/realtek/phy-rtk-usb2.c
drivers/phy/realtek/phy-rtk-usb3.c

index ed47a1ce5d9c4158a326f23fdc34b50d32c23ca2..5e7ee060b404faffcf9a43f6c079bd01c06673d2 100644 (file)
@@ -898,9 +898,10 @@ static int get_phy_data_by_efuse(struct rtk_phy *rtk_phy,
                size_t buf_size;
 
                buf = nvmem_cell_read(cell, &buf_size);
-               value = buf[0] & phy_cfg->dc_driving_mask;
-
-               kfree(buf);
+               if (!IS_ERR(buf)) {
+                       value = buf[0] & phy_cfg->dc_driving_mask;
+                       kfree(buf);
+               }
                nvmem_cell_put(cell);
        }
 
@@ -939,9 +940,10 @@ static int get_phy_data_by_efuse(struct rtk_phy *rtk_phy,
                size_t buf_size;
 
                buf = nvmem_cell_read(cell, &buf_size);
-               value = buf[0] & phy_cfg->dc_disconnect_mask;
-
-               kfree(buf);
+               if (!IS_ERR(buf)) {
+                       value = buf[0] & phy_cfg->dc_disconnect_mask;
+                       kfree(buf);
+               }
                nvmem_cell_put(cell);
        }
 
index 6050f1ef4f6b2a2faf624f32195a5cd0c1d09d37..7881f908aadea8b5514e23bbce8581589f4a43de 100644 (file)
@@ -457,9 +457,10 @@ static int get_phy_data_by_efuse(struct rtk_phy *rtk_phy,
                size_t buf_size;
 
                buf = nvmem_cell_read(cell, &buf_size);
-               value = buf[0] & USB_U3_TX_LFPS_SWING_TRIM_MASK;
-
-               kfree(buf);
+               if (!IS_ERR(buf)) {
+                       value = buf[0] & USB_U3_TX_LFPS_SWING_TRIM_MASK;
+                       kfree(buf);
+               }
                nvmem_cell_put(cell);
        }