shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: i2c: ov8858 fix otp null pointer crash

Browse Source 
Change-Id: Ic80e74fa3198a6f877b69d38a225a187dc53769e
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
This commit is contained in:
Wang Panzhenzhuan
2019-03-20 17:03:34 +08:00
committed by Tao Huang
parent 5b44e6b88e
commit d8c65325a2
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/i2c/ov8858.c
View File

@@ -1764,10 +1764,13 @@ static void ov8858_get_module_inf(struct ov8858 *ov8858,
strlcpy(inf->base.module, ov8858->module_name, sizeof(inf->base.module));
strlcpy(inf->base.lens, ov8858->len_name, sizeof(inf->base.lens));
if (ov8858->is_r2a)
ov8858_get_r2a_otp(otp_r2a, inf);
else
ov8858_get_r1a_otp(otp_r1a, inf);
if (ov8858->is_r2a) {
if (otp_r2a)
ov8858_get_r2a_otp(otp_r2a, inf);
} else {
if (otp_r1a)
ov8858_get_r1a_otp(otp_r1a, inf);
}
}
static void ov8858_set_module_inf(struct ov8858 *ov8858,
@@ -2505,6 +2508,7 @@ static int ov8858_otp_read_r1a(struct ov8858 *ov8858)
ov8858->otp_r1a = otp_ptr;
} else {
ov8858->otp_r1a = NULL;
dev_info(dev, "otp_r1a is null!\n");
kfree(otp_ptr);
}
@@ -2608,6 +2612,7 @@ static int ov8858_otp_read_r2a(struct ov8858 *ov8858)
ov8858->otp_r2a = otp_ptr;
} else {
ov8858->otp_r2a = NULL;
dev_info(dev, "otp_r2a is null!\n");
kfree(otp_ptr);
}