Message ID | Pine.LNX.4.64.1304191640010.591@axis700.grange (mailing list archive) |
---|---|
State | Superseded, archived |
Delegated to: | Guennadi Liakhovetski |
Headers |
Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from <linux-media-owner@vger.kernel.org>) id 1UTCUv-0007wK-2G; Fri, 19 Apr 2013 16:41:09 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp id 1UTCUu-0001hS-HA; Fri, 19 Apr 2013 16:41:08 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030664Ab3DSOlG (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Fri, 19 Apr 2013 10:41:06 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:60006 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030552Ab3DSOlF (ORCPT <rfc822;linux-media@vger.kernel.org>); Fri, 19 Apr 2013 10:41:05 -0400 Received: from axis700.grange (dslb-084-061-110-109.pools.arcor-ip.net [84.61.110.109]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0Lg0SZ-1Urpn33wSZ-00pPjP; Fri, 19 Apr 2013 16:41:03 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 8A5BD40BB4; Fri, 19 Apr 2013 16:41:02 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 886FA40BB3; Fri, 19 Apr 2013 16:41:02 +0200 (CEST) Date: Fri, 19 Apr 2013 16:41:02 +0200 (CEST) From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> X-X-Sender: lyakh@axis700.grange To: Linux Media Mailing List <linux-media@vger.kernel.org> cc: Prabhakar Lad <prabhakar.csengg@gmail.com> Subject: [PATCH] V4L2: fix subdevice matching in asynchronous probing Message-ID: <Pine.LNX.4.64.1304191640010.591@axis700.grange> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Provags-ID: V02:K0:YMtSbOQneuG6FZFuP+lfxRHMe45VYvAgIWDBMprb6tV dj77VXv4fUCpOMB3GbgDo+yiEJyKgxi9Df1DsziaeQGn1qop+k qraFyJwvMrX4A/4UYP2xI/am1emuk2hnytBQh6p7ZwESr+eScD KWg0VMymQ/QCyTVN2FuO6ePgb5hkvD8BQnK7iVNL2ePuNqLr0i ZdgV1VMTWJO1P225wPAO59o+s4omSsNjG5/LdEcy7Gg4XfESrW YW/PTXe+WhGhbM7atRpdwwQwNYGIeYWliJ6dwL4IUqIwVb7Vh+ 95FwggGIlV01LEacsMakf43Oft31dJyDeAD+n/lE/fxONH+VeF 2XTAhpoTAk9obGesD2ln3RRLeb8qoLKTKFWHHPLpRiipk+wzq9 jWMzVQ6WCs4yA== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.4.19.143333 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1100_1199 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS ' |
Commit Message
Guennadi Liakhovetski
April 19, 2013, 2:41 p.m. UTC
A wrapped list iterating loop hasn't been correctly recognised in
v4l2_async_belongs(), which led to false positives. Fix the bug by
verifying the loop termination condition.
Reported-by: Prabhakar Lad <prabhakar.csengg@gmail.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
Prabhakar, please, check, whether this fixes your problem.
drivers/media/v4l2-core/v4l2-async.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
Comments
Hi Guennadi, On Friday 19 April 2013 16:41:02 Guennadi Liakhovetski wrote: > A wrapped list iterating loop hasn't been correctly recognised in > v4l2_async_belongs(), which led to false positives. Fix the bug by > verifying the loop termination condition. > > Reported-by: Prabhakar Lad <prabhakar.csengg@gmail.com> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > --- > > Prabhakar, please, check, whether this fixes your problem. > > drivers/media/v4l2-core/v4l2-async.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/drivers/media/v4l2-core/v4l2-async.c > b/drivers/media/v4l2-core/v4l2-async.c index 5d6b428..5631944 100644 > --- a/drivers/media/v4l2-core/v4l2-async.c > +++ b/drivers/media/v4l2-core/v4l2-async.c > @@ -76,6 +76,10 @@ static struct v4l2_async_subdev > *v4l2_async_belongs(struct v4l2_async_notifier * > break; > } > > + if (&asd->list == ¬ifier->waiting) > + /* Wrapped - no match found */ > + return NULL; > + > return asd; > } What about just if (match && match(sd->dev, hw)) return asd; } return NULL; } That's a bit simpler.
On Mon, 22 Apr 2013, Laurent Pinchart wrote: > Hi Guennadi, > > On Friday 19 April 2013 16:41:02 Guennadi Liakhovetski wrote: > > A wrapped list iterating loop hasn't been correctly recognised in > > v4l2_async_belongs(), which led to false positives. Fix the bug by > > verifying the loop termination condition. > > > > Reported-by: Prabhakar Lad <prabhakar.csengg@gmail.com> > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > > --- > > > > Prabhakar, please, check, whether this fixes your problem. > > > > drivers/media/v4l2-core/v4l2-async.c | 4 ++++ > > 1 files changed, 4 insertions(+), 0 deletions(-) > > > > diff --git a/drivers/media/v4l2-core/v4l2-async.c > > b/drivers/media/v4l2-core/v4l2-async.c index 5d6b428..5631944 100644 > > --- a/drivers/media/v4l2-core/v4l2-async.c > > +++ b/drivers/media/v4l2-core/v4l2-async.c > > @@ -76,6 +76,10 @@ static struct v4l2_async_subdev > > *v4l2_async_belongs(struct v4l2_async_notifier * > > break; > > } > > > > + if (&asd->list == ¬ifier->waiting) > > + /* Wrapped - no match found */ > > + return NULL; > > + > > return asd; > > } > > What about just > > if (match && match(sd->dev, hw)) > return asd; > } > > return NULL; > } > > That's a bit simpler. Well, if it were simpler, it would've occurred to me instead of the other "more complex" solution, tight? ;-) No, sure, looks better, thanks! As soon as the actual patches are approved in principle, I'll merge this into them. Regards Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c index 5d6b428..5631944 100644 --- a/drivers/media/v4l2-core/v4l2-async.c +++ b/drivers/media/v4l2-core/v4l2-async.c @@ -76,6 +76,10 @@ static struct v4l2_async_subdev *v4l2_async_belongs(struct v4l2_async_notifier * break; } + if (&asd->list == ¬ifier->waiting) + /* Wrapped - no match found */ + return NULL; + return asd; }