public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

media: airspy: respect the DMA coherency rules

Browse source 
If we want to avoid memory corruption
on incoherent architectures, buffers for DMA
must not reside
- on the stack
- embedded within other structures

Allocate them separately.

v2: fix uninitialized return value

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Oliver Neukum 2022-05-18 09:10:45 +01:00 • committed by Mauro Carvalho Chehab
parent 6a0d673309
commit ca9dc8d06a
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/media/usb/airspy/airspy.c
View file

@ -123,7 +123,7 @@ struct airspy {
/* USB control message buffer */ /* USB control message buffer */
#define BUF_SIZE 128 #define BUF_SIZE 128
u8 buf[BUF_SIZE]; u8 *buf;
/* Current configuration */ /* Current configuration */
unsigned int f_adc; unsigned int f_adc;
@ -856,6 +856,7 @@ static void airspy_video_release(struct v4l2_device *v)
v4l2_ctrl_handler_free(&s->hdl); v4l2_ctrl_handler_free(&s->hdl);
v4l2_device_unregister(&s->v4l2_dev); v4l2_device_unregister(&s->v4l2_dev);
kfree(s->buf);
kfree(s); kfree(s);
} }
@ -963,7 +964,10 @@ static int airspy_probe(struct usb_interface *intf,
{ {
struct airspy *s; struct airspy *s;
int ret; int ret;
u8 u8tmp, buf[BUF_SIZE]; u8 u8tmp, *buf;
buf = NULL;
ret = -ENOMEM;
s = kzalloc(sizeof(struct airspy), GFP_KERNEL); s = kzalloc(sizeof(struct airspy), GFP_KERNEL);
if (s == NULL) { if (s == NULL) {
@ -971,6 +975,13 @@ static int airspy_probe(struct usb_interface *intf,
return -ENOMEM; return -ENOMEM;
} }
s->buf = kzalloc(BUF_SIZE, GFP_KERNEL);
if (!s->buf)
goto err_free_mem;
buf = kzalloc(BUF_SIZE, GFP_KERNEL);
if (!buf)
goto err_free_mem;
mutex_init(&s->v4l2_lock); mutex_init(&s->v4l2_lock);
mutex_init(&s->vb_queue_lock); mutex_init(&s->vb_queue_lock);
spin_lock_init(&s->queued_bufs_lock); spin_lock_init(&s->queued_bufs_lock);
@ -1068,6 +1079,8 @@ err_free_controls:
v4l2_ctrl_handler_free(&s->hdl); v4l2_ctrl_handler_free(&s->hdl);
v4l2_device_unregister(&s->v4l2_dev); v4l2_device_unregister(&s->v4l2_dev);
err_free_mem: err_free_mem:
kfree(buf);
kfree(s->buf);
kfree(s); kfree(s);
return ret; return ret;
} }