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>, "Sean Young" <sean@mess.org>,
"Hans Verkuil" <hans.verkuil@cisco.com>,
"Kees Cook" <keescook@chromium.org>,
"Wolfram Sang" <wsa-dev@sang-engineering.com>,
"Nicolas Sugino" <nsugino@3way.com.ar>,
"Alejandro Torrado" <aletorrado@gmail.com>
Subject: [PATCH v2 07/31] dib0700: be sure that dib0700_ctrl_rd() users can do DMA
Date: Tue, 11 Oct 2016 07:09:22 -0300 [thread overview]
Message-ID: <73fbb9abc0daf5f733781ba77ff741e4f6bc3a01.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>
dib0700_ctrl_rd() takes a RX and a TX pointer. Be sure that
both will point to a memory allocated via kmalloc().
Reviewed-By: Patrick Boettcher <patrick.boettcher@posteo.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
drivers/media/usb/dvb-usb/dib0700_core.c | 4 +++-
drivers/media/usb/dvb-usb/dib0700_devices.c | 25 +++++++++++++------------
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/drivers/media/usb/dvb-usb/dib0700_core.c b/drivers/media/usb/dvb-usb/dib0700_core.c
index f3196658fb70..515f89dba199 100644
--- a/drivers/media/usb/dvb-usb/dib0700_core.c
+++ b/drivers/media/usb/dvb-usb/dib0700_core.c
@@ -292,13 +292,15 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap,
/* special thing in the current firmware: when length is zero the read-failed */
len = dib0700_ctrl_rd(d, st->buf, msg[i].len + 2,
- msg[i+1].buf, msg[i+1].len);
+ st->buf, msg[i + 1].len);
if (len <= 0) {
deb_info("I2C read failed on address 0x%02x\n",
msg[i].addr);
break;
}
+ memcpy(msg[i + 1].buf, st->buf, msg[i + 1].len);
+
msg[i+1].len = len;
i++;
diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c
index 0857b56e652c..ef1b8ee75c57 100644
--- a/drivers/media/usb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/usb/dvb-usb/dib0700_devices.c
@@ -508,8 +508,6 @@ static int stk7700ph_tuner_attach(struct dvb_usb_adapter *adap)
#define DEFAULT_RC_INTERVAL 50
-static u8 rc_request[] = { REQUEST_POLL_RC, 0 };
-
/*
* This function is used only when firmware is < 1.20 version. Newer
* firmwares use bulk mode, with functions implemented at dib0700_core,
@@ -517,7 +515,6 @@ static u8 rc_request[] = { REQUEST_POLL_RC, 0 };
*/
static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d)
{
- u8 key[4];
enum rc_type protocol;
u32 scancode;
u8 toggle;
@@ -532,39 +529,43 @@ static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d)
return 0;
}
- i = dib0700_ctrl_rd(d, rc_request, 2, key, 4);
+ st->buf[0] = REQUEST_POLL_RC;
+ st->buf[1] = 0;
+
+ i = dib0700_ctrl_rd(d, st->buf, 2, st->buf, 4);
if (i <= 0) {
err("RC Query Failed");
- return -1;
+ return -EIO;
}
/* losing half of KEY_0 events from Philipps rc5 remotes.. */
- if (key[0] == 0 && key[1] == 0 && key[2] == 0 && key[3] == 0)
+ if (st->buf[0] == 0 && st->buf[1] == 0
+ && st->buf[2] == 0 && st->buf[3] == 0)
return 0;
- /* info("%d: %2X %2X %2X %2X",dvb_usb_dib0700_ir_proto,(int)key[3-2],(int)key[3-3],(int)key[3-1],(int)key[3]); */
+ /* info("%d: %2X %2X %2X %2X",dvb_usb_dib0700_ir_proto,(int)st->buf[3 - 2],(int)st->buf[3 - 3],(int)st->buf[3 - 1],(int)st->buf[3]); */
dib0700_rc_setup(d, NULL); /* reset ir sensor data to prevent false events */
switch (d->props.rc.core.protocol) {
case RC_BIT_NEC:
/* NEC protocol sends repeat code as 0 0 0 FF */
- if ((key[3-2] == 0x00) && (key[3-3] == 0x00) &&
- (key[3] == 0xff)) {
+ if ((st->buf[3 - 2] == 0x00) && (st->buf[3 - 3] == 0x00) &&
+ (st->buf[3] == 0xff)) {
rc_repeat(d->rc_dev);
return 0;
}
protocol = RC_TYPE_NEC;
- scancode = RC_SCANCODE_NEC(key[3-2], key[3-3]);
+ scancode = RC_SCANCODE_NEC(st->buf[3 - 2], st->buf[3 - 3]);
toggle = 0;
break;
default:
/* RC-5 protocol changes toggle bit on new keypress */
protocol = RC_TYPE_RC5;
- scancode = RC_SCANCODE_RC5(key[3-2], key[3-3]);
- toggle = key[3-1];
+ scancode = RC_SCANCODE_RC5(st->buf[3 - 2], st->buf[3 - 3]);
+ toggle = st->buf[3 - 1];
break;
}
--
2.7.4
next prev parent reply other threads:[~2016-10-11 10:18 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 ` Mauro Carvalho Chehab [this message]
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 ` [PATCH v2 22/31] pctv452e: don't call BUG_ON() on non-fatal error Mauro Carvalho Chehab
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=73fbb9abc0daf5f733781ba77ff741e4f6bc3a01.1476179975.git.mchehab@s-opensource.com \
--to=mchehab@s-opensource.com \
--cc=aletorrado@gmail.com \
--cc=hans.verkuil@cisco.com \
--cc=jikos@kernel.org \
--cc=jrg.otte@gmail.com \
--cc=js@linuxtv.org \
--cc=keescook@chromium.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=nsugino@3way.com.ar \
--cc=patrick.boettcher@posteo.de \
--cc=sean@mess.org \
--cc=wsa-dev@sang-engineering.com \
/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).