From ed8f558a4536735915a4c615c2460dd3bb40051b Mon Sep 17 00:00:00 2001 From: sunyue5 Date: Thu, 27 Sep 2018 17:43:08 +0800 Subject: [PATCH] scsc: avoid panic when getting bt/wifi mac Fix a slip of sscanf usage Change-Id: I3b3975719267007d17bfb76fd21b828b76490ce9 Signed-off-by: sunyue5 Reviewed-on: https://gerrit.mot.com/1247584 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- drivers/misc/samsung/scsc_bt/scsc_bt_module.c | 4 ++-- drivers/net/wireless/scsc/mgt.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/misc/samsung/scsc_bt/scsc_bt_module.c b/drivers/misc/samsung/scsc_bt/scsc_bt_module.c index 70f9a2e0552a..c2572306a607 100755 --- a/drivers/misc/samsung/scsc_bt/scsc_bt_module.c +++ b/drivers/misc/samsung/scsc_bt/scsc_bt_module.c @@ -787,10 +787,10 @@ static int setup_bhcs(struct scsc_service *service, char macStr[MACSTRLEN+1] = {0}; u32 u[SCSC_BT_ADDR_LEN] = {0}; // extract MAC from boot params - mac_idx += strlen(WIFI_MAC_BOOTARG); + mac_idx += strlen(BT_MAC_BOOTARG); memcpy(macStr, mac_idx, MACSTRLEN); sscanf(macStr, "%02X:%02X:%02X:%02X:%02X:%02X", - u[0], u[1], u[2], u[3], u[4], u[5]); + &u[0], &u[1], &u[2], &u[3], &u[4], &u[5]); bhcs->bluetooth_address_lap = (u[3] << 16) | (u[4] << 8) | u[5]; bhcs->bluetooth_address_uap = u[2]; diff --git a/drivers/net/wireless/scsc/mgt.c b/drivers/net/wireless/scsc/mgt.c index 55f52f8dd860..3befd5451e85 100755 --- a/drivers/net/wireless/scsc/mgt.c +++ b/drivers/net/wireless/scsc/mgt.c @@ -240,7 +240,7 @@ void slsi_get_hw_mac_address(struct slsi_dev *sdev, u8 *addr) mac_idx += strlen(WIFI_MAC_BOOTARG); memcpy(macStr, mac_idx, MACSTRLEN); sscanf(macStr, "%02X:%02X:%02X:%02X:%02X:%02X", - u[0], u[1], u[2], u[3], u[4], u[5]); + &u[0], &u[1], &u[2], &u[3], &u[4], &u[5]); for (i = 0; i < ETH_ALEN; i++) addr[i] = u[i] & 0xff; SLSI_INFO(sdev, "WiFi MAC address loaded from utag: %02X:%02X:%02X:%02X:%02X:%02X\n", -- 2.20.1