Skip to contentSkip to conversation

Patch "[media] cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC)" has been added to the 4.11-stable tree

PATCH [email protected] 1 participant 1 message May 23, 2017

Subsystems (3)
Stable branch Media (V4L/DVB) CEC framework
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

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

to the 4.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
cec-fix-runtime-bug-when-config_rc_core-cec_cap_rc.patch
and it can be found in the queue-4.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 43c0c03961d0b19bd225a336897606b46e0021a6 Mon Sep 17 00:00:00 2001

From: Lee Jones <[email protected]>
Date: Tue, 4 Apr 2017 09:32:19 -0300
Subject: [media] cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC)

From: Lee Jones <[email protected]>

commit 43c0c03961d0b19bd225a336897606b46e0021a6 upstream.

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()")
Signed-off-by Lee Jones <[email protected]>
Signed-off-by Hans Verkuil <[email protected]>
Signed-off-by Mauro Carvalho Chehab <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/media/cec/cec-core.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/cec/cec-core.c +1 -1
@@ -286,8 +286,8 @@ int cec_register_adapter(struct cec_adap
 	adap->devnode.dev.parent = parent;
 
 #if IS_REACHABLE(CONFIG_RC_CORE)
-	adap->rc->dev.parent = parent;
 	if (adap->capabilities & CEC_CAP_RC) {
+		adap->rc->dev.parent = parent;
 		res = rc_register_device(adap->rc);
 
 		if (res) {

Patches currently in stable-queue which might be from [email protected] are

queue-4.11/cec-fix-runtime-bug-when-config_rc_core-cec_cap_rc.patch