evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC)

Browse source 
Currently when the RC Core is enabled (reachable) core code located
in cec_register_adapter() attempts to populate the RC structure with
a pointer to the 'parent' passed in by the caller.

Unfortunately if the caller did not specify RC capability when calling
cec_allocate_adapter(), then there will be no RC structure to populate.

This causes a "NULL pointer dereference" error.

Fixes: f51e80804f0 ("[media] cec: pass parent device in register(), not allocate()")

Change-Id: I3fd2fa133ccdfe2072e42efa60c2a6421f5dd1f1
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Cc: <stable@vger.kernel.org>      # for v4.10 and up
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Git-commit: 43c0c03961d0b19bd225a336897606b46e0021a6
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
CRs-Fixed: 2117569
Signed-off-by: Zhiming Weng <czweng@codeaurora.org>
This commit is contained in:
Lee Jones 2017-04-04 09:32:19 -03:00 • committed by Zhiming Weng
parent 88f238f177
commit e1113aa7b2
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/cec/cec-core.c
View file

@ -305,8 +305,8 @@ int cec_register_adapter(struct cec_adapter *adap,
adap->devnode.dev.parent = parent; adap->devnode.dev.parent = parent;
#if IS_REACHABLE(CONFIG_RC_CORE) #if IS_REACHABLE(CONFIG_RC_CORE)
adap->rc->dev.parent = parent;
if (adap->capabilities & CEC_CAP_RC) { if (adap->capabilities & CEC_CAP_RC) {
adap->rc->dev.parent = parent;
res = rc_register_device(adap->rc); res = rc_register_device(adap->rc);
if (res) { if (res) {