From: Antonio Ospite <ao2@ao2.it>
To: linux-media@vger.kernel.org
Cc: Antonio Ospite <ao2@ao2.it>, Gregor Jasny <gjasny@googlemail.com>
Subject: [PATCH] libv4lconvert: Fix a regression when converting from Y10B
Date: Tue, 3 Jun 2014 15:48:46 +0200 [thread overview]
Message-ID: <1401803326-31942-1-git-send-email-ao2@ao2.it> (raw)
Fix a regression introduced in commit
efc29f1764a30808ebf7b3e1d9bfa27b909bf641 (libv4lconvert: Reject too
short source buffer before accessing it).
The old code:
case V4L2_PIX_FMT_Y10BPACK:
...
if (result == 0 && src_size < (width * height * 10 / 8)) {
V4LCONVERT_ERR("short y10b data frame\n");
errno = EPIPE;
result = -1;
}
...
meant to say "If the conversion was *successful* _but_ the frame size
was invalid, then take the error path", but in
efc29f1764a30808ebf7b3e1d9bfa27b909bf641 this (maybe weird) logic was
misunderstood and the v4lconvert_convert_pixfmt() was made to return an
error even in the case of a successful conversion from Y10B.
Fix the check, and now print only the message letting the errno and the
result from the conversion routines to be propagated to the caller.
Signed-off-by: Antonio Ospite <ao2@ao2.it>
Cc: Gregor Jasny <gjasny@googlemail.com>
---
Hi,
the regression affects only the users of the gspca-kinect driver when using
the IR stream.
I think this should be cherry-picked in stable-1.0 too.
BTW Gregor, in efc29f1764a30808ebf7b3e1d9bfa27b909bf641 you say "Reject too
short source buffer before accessing it" but the code only does "result = -1"
and then still calls the conversion routines, so it's not actually *rejecting*
the frames, am I missing anything?
Thanks,
Antonio
lib/libv4lconvert/libv4lconvert.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/lib/libv4lconvert/libv4lconvert.c b/lib/libv4lconvert/libv4lconvert.c
index c49d30d..50d6906 100644
--- a/lib/libv4lconvert/libv4lconvert.c
+++ b/lib/libv4lconvert/libv4lconvert.c
@@ -1052,11 +1052,8 @@ static int v4lconvert_convert_pixfmt(struct v4lconvert_data *data,
width, height);
break;
}
- if (result == 0) {
+ if (result != 0)
V4LCONVERT_ERR("y10b conversion failed\n");
- errno = EPIPE;
- result = -1;
- }
break;
case V4L2_PIX_FMT_RGB565:
--
2.0.0
next reply other threads:[~2014-06-03 13:48 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-03 13:48 Antonio Ospite [this message]
2014-06-03 13:59 ` [PATCH] libv4lconvert: Fix a regression when converting from Y10B Antonio Ospite
2014-06-16 15:00 ` [PATCH RESEND] " Antonio Ospite
2014-06-18 11:43 ` Hans de Goede
2014-06-18 11:46 ` Hans de Goede
2014-06-18 13:23 ` Antonio Ospite
2014-06-18 13:59 ` Hans de Goede
2014-06-18 14:40 ` Antonio Ospite
2014-06-19 8:27 ` Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401803326-31942-1-git-send-email-ao2@ao2.it \
--to=ao2@ao2.it \
--cc=gjasny@googlemail.com \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.