Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1615978 > unrolled thread
| Started by | Lee Jones <lee.jones@linaro.org> |
|---|---|
| First post | 2017-04-04 14:40 +0200 |
| Last post | 2017-04-04 15:00 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 2/2] [media] cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC) Lee Jones <lee.jones@linaro.org> - 2017-04-04 14:40 +0200
Re: [PATCH 2/2] [media] cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC) Hans Verkuil <hverkuil@xs4all.nl> - 2017-04-04 14:50 +0200
Re: [PATCH 2/2] [media] cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC) Lee Jones <lee.jones@linaro.org> - 2017-04-04 15:00 +0200
| From | Lee Jones <lee.jones@linaro.org> |
|---|---|
| Date | 2017-04-04 14:40 +0200 |
| Subject | [PATCH 2/2] [media] cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC) |
| Message-ID | <tsvUC-4Rz-3@gated-at.bofh.it> |
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 <lee.jones@linaro.org>
---
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) {
--
2.9.3
[toc] | [next] | [standalone]
| From | Hans Verkuil <hverkuil@xs4all.nl> |
|---|---|
| Date | 2017-04-04 14:50 +0200 |
| Subject | Re: [PATCH 2/2] [media] cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC) |
| Message-ID | <tsw4i-4Ve-25@gated-at.bofh.it> |
| In reply to | #1615978 |
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 <lee.jones@linaro.org>
Oops! Thanks for the report. I'll take this for 4.12.
Regards,
Hans
> ---
> 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) {
>
[toc] | [prev] | [next] | [standalone]
| From | Lee Jones <lee.jones@linaro.org> |
|---|---|
| Date | 2017-04-04 15:00 +0200 |
| Subject | Re: [PATCH 2/2] [media] cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC) |
| Message-ID | <tswdX-50q-23@gated-at.bofh.it> |
| In reply to | #1615995 |
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 <lee.jones@linaro.org>
>
> 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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web