From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
To: Linux Media Mailing List <linux-media@vger.kernel.org>
Cc: "Mauro Carvalho Chehab" <mchehab@s-opensource.com>,
"Mauro Carvalho Chehab" <mchehab@infradead.org>,
"Andy Lutomirski" <luto@amacapital.net>,
"Johannes Stezenbach" <js@linuxtv.org>,
"Jiri Kosina" <jikos@kernel.org>,
"Patrick Boettcher" <patrick.boettcher@posteo.de>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Andy Lutomirski" <luto@kernel.org>,
"Michael Krufky" <mkrufky@linuxtv.org>,
"Mauro Carvalho Chehab" <mchehab@kernel.org>,
"Jörg Otte" <jrg.otte@gmail.com>,
"Olli Salonen" <olli.salonen@iki.fi>
Subject: [PATCH v2 22/31] pctv452e: don't call BUG_ON() on non-fatal error
Date: Tue, 11 Oct 2016 07:09:37 -0300 [thread overview]
Message-ID: <309c127fc9502dbe901a66c184b1041a3ba3cfef.1476179975.git.mchehab@s-opensource.com> (raw)
In-Reply-To: <cover.1476179975.git.mchehab@s-opensource.com>
In-Reply-To: <cover.1476179975.git.mchehab@s-opensource.com>
There are some conditions on this driver that are tested with
BUG_ON() with are not serious enough to hang a machine.
So, just return an error if this happens.
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
drivers/media/usb/dvb-usb/pctv452e.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/media/usb/dvb-usb/pctv452e.c b/drivers/media/usb/dvb-usb/pctv452e.c
index 58b685094904..7ad0006c5ae0 100644
--- a/drivers/media/usb/dvb-usb/pctv452e.c
+++ b/drivers/media/usb/dvb-usb/pctv452e.c
@@ -109,9 +109,10 @@ static int tt3650_ci_msg(struct dvb_usb_device *d, u8 cmd, u8 *data,
unsigned int rlen;
int ret;
- BUG_ON(NULL == data && 0 != (write_len | read_len));
- BUG_ON(write_len > 64 - 4);
- BUG_ON(read_len > 64 - 4);
+ if (!data || (write_len > 64 - 4) || (read_len > 64 - 4)) {
+ err("%s: transfer data invalid", __func__);
+ return -EIO;
+ };
mutex_lock(&state->ca_mutex);
id = state->c++;
--
2.7.4
next prev parent reply other threads:[~2016-10-11 10:16 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-11 10:09 [PATCH v2 00/31] Don't use stack for DMA transers on media usb drivers Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 01/31] af9005: don't do DMA on stack Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 02/31] cinergyT2-core: " Mauro Carvalho Chehab
2016-10-15 20:54 ` Johannes Stezenbach
2016-10-17 17:12 ` Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 03/31] cinergyT2-core: handle error code on RC query Mauro Carvalho Chehab
2016-10-12 2:13 ` [PATCH v2.1 " Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 04/31] cinergyT2-fe: cache stats at cinergyt2_fe_read_status() Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 05/31] cinergyT2-fe: don't do DMA on stack Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 06/31] cxusb: " Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 07/31] dib0700: be sure that dib0700_ctrl_rd() users can do DMA Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 08/31] dib0700_core: don't use stack on I2C reads Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 09/31] dibusb: don't do DMA on stack Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 10/31] dibusb: handle error code on RC query Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 11/31] digitv: don't do DMA on stack Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 12/31] dtt200u-fe: don't keep waiting for lock at set_frontend() Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 13/31] dtt200u-fe: don't do DMA on stack Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 14/31] dtt200u-fe: handle errors on USB control messages Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 15/31] dtt200u: don't do DMA on stack Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 16/31] dtt200u: handle USB control message errors Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 17/31] dtv5100: don't do DMA on stack Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 18/31] gp8psk: " Mauro Carvalho Chehab
2016-11-06 19:51 ` VDR User
2016-11-07 11:29 ` Johannes Stezenbach
2016-11-07 12:53 ` Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 19/31] gp8psk: don't go past the buffer size Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 20/31] nova-t-usb2: don't do DMA on stack Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 21/31] pctv452e: " Mauro Carvalho Chehab
2016-10-11 10:09 ` Mauro Carvalho Chehab [this message]
2016-10-11 10:09 ` [PATCH v2 23/31] technisat-usb2: use DMA buffers for I2C transfers Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 24/31] dvb-usb: warn if return value for USB read/write routines is not checked Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 25/31] nova-t-usb2: handle error code on RC query Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 26/31] dw2102: return error if su3000_power_ctrl() fails Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 27/31] digitv: handle error code on RC query Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 28/31] cpia2_usb: don't use stack for DMA Mauro Carvalho Chehab
2016-10-11 22:56 ` Kosuke Tatsukawa
2016-10-12 2:18 ` [PATCH v2 .1 " Mauro Carvalho Chehab
2016-10-12 2:19 ` [PATCH v2 " Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 29/31] s2255drv: " Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 30/31] stk-webcam: " Mauro Carvalho Chehab
2016-10-11 10:09 ` [PATCH v2 31/31] flexcop-usb: " Mauro Carvalho Chehab
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=309c127fc9502dbe901a66c184b1041a3ba3cfef.1476179975.git.mchehab@s-opensource.com \
--to=mchehab@s-opensource.com \
--cc=jikos@kernel.org \
--cc=jrg.otte@gmail.com \
--cc=js@linuxtv.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=luto@kernel.org \
--cc=mchehab@infradead.org \
--cc=mchehab@kernel.org \
--cc=mkrufky@linuxtv.org \
--cc=olli.salonen@iki.fi \
--cc=patrick.boettcher@posteo.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).