From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754363AbdDDMzt (ORCPT ); Tue, 4 Apr 2017 08:55:49 -0400 Received: from mail-lf0-f47.google.com ([209.85.215.47]:35868 "EHLO mail-lf0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753990AbdDDMzq (ORCPT ); Tue, 4 Apr 2017 08:55:46 -0400 Date: Tue, 4 Apr 2017 13:55:41 +0100 From: Lee Jones To: Hans Verkuil Cc: hans.verkuil@cisco.com, mchehab@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@stlinux.com, patrice.chotard@st.com, linux-media@vger.kernel.org, benjamin.gaignard@st.com Subject: Re: [PATCH 2/2] [media] cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC) Message-ID: <20170404125541.utwnfldhvpjkegll@dell> References: <20170404123219.22040-1-lee.jones@linaro.org> <20170404123219.22040-2-lee.jones@linaro.org> <998c967a-6cac-8d01-6339-2b58f7651c54@xs4all.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <998c967a-6cac-8d01-6339-2b58f7651c54@xs4all.nl> User-Agent: Mutt/1.6.2-neo (2016-08-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 04 Apr 2017, Hans Verkuil wrote: > On 04/04/2017 02:32 PM, Lee Jones wrote: > > 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 capibility 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 > > Oops! Thanks for the report. I'll take this for 4.12. Since this is a -fix, it should really go in for v4.11. > > --- > > drivers/media/cec/cec-core.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/media/cec/cec-core.c b/drivers/media/cec/cec-core.c > > index 06a312c..d64937b 100644 > > --- a/drivers/media/cec/cec-core.c > > +++ b/drivers/media/cec/cec-core.c > > @@ -286,8 +286,8 @@ int cec_register_adapter(struct cec_adapter *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) { > > > -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog