Skip to content

Commit 8e484eb

Browse files
hayesorzdavem330
authored andcommitted
r8152: check the pointer rtl_fw->fw before using it
Fix the pointer rtl_fw->fw would be used before checking in rtl8152_apply_firmware() that causes the following kernel oops. Unable to handle kernel NULL pointer dereference at virtual address 00000002 pgd = (ptrval) [00000002] *pgd=00000000 Internal error: Oops: 5 [#1] PREEMPT SMP ARM Modules linked in: CPU: 0 PID: 131 Comm: kworker/0:2 Not tainted 5.4.0-rc1-00539-g9370f2d05a2a #6788 Hardware name: SAMSUNG EXYNOS (Flattened Device Tree) Workqueue: events_long rtl_hw_phy_work_func_t PC is at rtl8152_apply_firmware+0x14/0x464 LR is at r8153_hw_phy_cfg+0x24/0x17c pc : [<c064f4e4>] lr : [<c064fa18>] psr: a0000013 sp : e75c9e60 ip : 60000013 fp : c11b7614 r10: e883b91c r9 : 00000000 r8 : fffffffe r7 : e883b640 r6 : fffffffe r5 : fffffffe r4 : e883b640 r3 : 736cfe7c r2 : 736cfe7c r1 : 000052f8 r0 : e883b640 Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none Control: 10c5387d Table: 6640006a DAC: 00000051 Process kworker/0:2 (pid: 131, stack limit = 0x(ptrval)) Stack: (0xe75c9e60 to 0xe75ca000) ... [<c064f4e4>] (rtl8152_apply_firmware) from [<c064fa18>] (r8153_hw_phy_cfg+0x24/0x17c) [<c064fa18>] (r8153_hw_phy_cfg) from [<c064e784>] (rtl_hw_phy_work_func_t+0x220/0x3e4) [<c064e784>] (rtl_hw_phy_work_func_t) from [<c0148a74>] (process_one_work+0x22c/0x7c8) [<c0148a74>] (process_one_work) from [<c0149054>] (worker_thread+0x44/0x520) [<c0149054>] (worker_thread) from [<c0150548>] (kthread+0x130/0x164) [<c0150548>] (kthread) from [<c01010b4>] (ret_from_fork+0x14/0x20) Exception stack(0xe75c9fb0 to 0xe75c9ff8) ... Fixes: 9370f2d ("r8152: support request_firmware for RTL8153") Reported-by: Marek Szyprowski <[email protected]> Tested-by: Marek Szyprowski <[email protected]> Signed-off-by: Hayes Wang <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 503a646 commit 8e484eb

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/net/usb/r8152.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4000,15 +4000,18 @@ static void rtl8152_fw_mac_apply(struct r8152 *tp, struct fw_mac *mac)
40004000
static void rtl8152_apply_firmware(struct r8152 *tp)
40014001
{
40024002
struct rtl_fw *rtl_fw = &tp->rtl_fw;
4003-
const struct firmware *fw = rtl_fw->fw;
4004-
struct fw_header *fw_hdr = (struct fw_header *)fw->data;
4003+
const struct firmware *fw;
4004+
struct fw_header *fw_hdr;
40054005
struct fw_phy_patch_key *key;
40064006
u16 key_addr = 0;
40074007
int i;
40084008

40094009
if (IS_ERR_OR_NULL(rtl_fw->fw))
40104010
return;
40114011

4012+
fw = rtl_fw->fw;
4013+
fw_hdr = (struct fw_header *)fw->data;
4014+
40124015
if (rtl_fw->pre_fw)
40134016
rtl_fw->pre_fw(tp);
40144017

0 commit comments

Comments
 (0)