2019-05-27 08:55:05 +02:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
2005-04-17 00:20:36 +02:00
|
|
|
/*
|
|
|
|
* 32bit -> 64bit ioctl wrapper for PCM API
|
|
|
|
* Copyright (c) by Takashi Iwai <tiwai@suse.de>
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* This file included from pcm_native.c */
|
|
|
|
|
|
|
|
#include <linux/compat.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 09:04:11 +01:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2005-11-17 13:59:38 +01:00
|
|
|
static int snd_pcm_ioctl_delay_compat(struct snd_pcm_substream *substream,
|
2005-04-17 00:20:36 +02:00
|
|
|
s32 __user *src)
|
|
|
|
{
|
|
|
|
snd_pcm_sframes_t delay;
|
2018-04-21 06:20:46 +02:00
|
|
|
int err;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2018-04-21 06:20:46 +02:00
|
|
|
err = snd_pcm_delay(substream, &delay);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2005-04-17 00:20:36 +02:00
|
|
|
if (put_user(delay, src))
|
|
|
|
return -EFAULT;
|
2017-05-10 14:33:44 +02:00
|
|
|
return 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2005-11-17 13:59:38 +01:00
|
|
|
static int snd_pcm_ioctl_rewind_compat(struct snd_pcm_substream *substream,
|
2005-04-17 00:20:36 +02:00
|
|
|
u32 __user *src)
|
|
|
|
{
|
|
|
|
snd_pcm_uframes_t frames;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (get_user(frames, src))
|
|
|
|
return -EFAULT;
|
2018-04-11 17:56:52 +02:00
|
|
|
err = snd_pcm_rewind(substream, frames);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (put_user(err, src))
|
|
|
|
return -EFAULT;
|
|
|
|
return err < 0 ? err : 0;
|
|
|
|
}
|
|
|
|
|
2005-11-17 13:59:38 +01:00
|
|
|
static int snd_pcm_ioctl_forward_compat(struct snd_pcm_substream *substream,
|
2005-04-17 00:20:36 +02:00
|
|
|
u32 __user *src)
|
|
|
|
{
|
|
|
|
snd_pcm_uframes_t frames;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (get_user(frames, src))
|
|
|
|
return -EFAULT;
|
2018-04-11 17:56:52 +02:00
|
|
|
err = snd_pcm_forward(substream, frames);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (put_user(err, src))
|
|
|
|
return -EFAULT;
|
|
|
|
return err < 0 ? err : 0;
|
|
|
|
}
|
|
|
|
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_pcm_hw_params32 {
|
2005-04-17 00:20:36 +02:00
|
|
|
u32 flags;
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - SNDRV_PCM_HW_PARAM_FIRST_MASK + 1]; /* this must be identical */
|
|
|
|
struct snd_mask mres[5]; /* reserved masks */
|
|
|
|
struct snd_interval intervals[SNDRV_PCM_HW_PARAM_LAST_INTERVAL - SNDRV_PCM_HW_PARAM_FIRST_INTERVAL + 1];
|
|
|
|
struct snd_interval ires[9]; /* reserved intervals */
|
2005-04-17 00:20:36 +02:00
|
|
|
u32 rmask;
|
|
|
|
u32 cmask;
|
|
|
|
u32 info;
|
|
|
|
u32 msbits;
|
|
|
|
u32 rate_num;
|
|
|
|
u32 rate_den;
|
|
|
|
u32 fifo_size;
|
|
|
|
unsigned char reserved[64];
|
|
|
|
};
|
|
|
|
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_pcm_sw_params32 {
|
2005-04-17 00:20:36 +02:00
|
|
|
s32 tstamp_mode;
|
|
|
|
u32 period_step;
|
|
|
|
u32 sleep_min;
|
|
|
|
u32 avail_min;
|
|
|
|
u32 xfer_align;
|
|
|
|
u32 start_threshold;
|
|
|
|
u32 stop_threshold;
|
|
|
|
u32 silence_threshold;
|
|
|
|
u32 silence_size;
|
|
|
|
u32 boundary;
|
2014-07-16 18:07:30 +02:00
|
|
|
u32 proto;
|
|
|
|
u32 tstamp_type;
|
|
|
|
unsigned char reserved[56];
|
2005-04-17 00:20:36 +02:00
|
|
|
};
|
|
|
|
|
2005-08-15 15:01:10 +02:00
|
|
|
/* recalcuate the boundary within 32bit */
|
2005-11-17 13:59:38 +01:00
|
|
|
static snd_pcm_uframes_t recalculate_boundary(struct snd_pcm_runtime *runtime)
|
2005-08-15 15:01:10 +02:00
|
|
|
{
|
|
|
|
snd_pcm_uframes_t boundary;
|
|
|
|
|
|
|
|
if (! runtime->buffer_size)
|
|
|
|
return 0;
|
|
|
|
boundary = runtime->buffer_size;
|
|
|
|
while (boundary * 2 <= 0x7fffffffUL - runtime->buffer_size)
|
|
|
|
boundary *= 2;
|
|
|
|
return boundary;
|
|
|
|
}
|
|
|
|
|
2005-11-17 13:59:38 +01:00
|
|
|
static int snd_pcm_ioctl_sw_params_compat(struct snd_pcm_substream *substream,
|
|
|
|
struct snd_pcm_sw_params32 __user *src)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_pcm_sw_params params;
|
2005-08-15 15:01:10 +02:00
|
|
|
snd_pcm_uframes_t boundary;
|
2005-04-17 00:20:36 +02:00
|
|
|
int err;
|
|
|
|
|
|
|
|
memset(¶ms, 0, sizeof(params));
|
|
|
|
if (get_user(params.tstamp_mode, &src->tstamp_mode) ||
|
|
|
|
get_user(params.period_step, &src->period_step) ||
|
|
|
|
get_user(params.sleep_min, &src->sleep_min) ||
|
|
|
|
get_user(params.avail_min, &src->avail_min) ||
|
|
|
|
get_user(params.xfer_align, &src->xfer_align) ||
|
|
|
|
get_user(params.start_threshold, &src->start_threshold) ||
|
|
|
|
get_user(params.stop_threshold, &src->stop_threshold) ||
|
|
|
|
get_user(params.silence_threshold, &src->silence_threshold) ||
|
2014-07-16 18:07:30 +02:00
|
|
|
get_user(params.silence_size, &src->silence_size) ||
|
|
|
|
get_user(params.tstamp_type, &src->tstamp_type) ||
|
|
|
|
get_user(params.proto, &src->proto))
|
2005-04-17 00:20:36 +02:00
|
|
|
return -EFAULT;
|
2005-08-15 15:01:10 +02:00
|
|
|
/*
|
|
|
|
* Check silent_size parameter. Since we have 64bit boundary,
|
|
|
|
* silence_size must be compared with the 32bit boundary.
|
|
|
|
*/
|
|
|
|
boundary = recalculate_boundary(substream->runtime);
|
|
|
|
if (boundary && params.silence_size >= boundary)
|
|
|
|
params.silence_size = substream->runtime->boundary;
|
2005-04-17 00:20:36 +02:00
|
|
|
err = snd_pcm_sw_params(substream, ¶ms);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
2005-08-25 19:51:47 +02:00
|
|
|
if (boundary && put_user(boundary, &src->boundary))
|
2005-04-17 00:20:36 +02:00
|
|
|
return -EFAULT;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_pcm_channel_info32 {
|
2005-04-17 00:20:36 +02:00
|
|
|
u32 channel;
|
|
|
|
u32 offset;
|
|
|
|
u32 first;
|
|
|
|
u32 step;
|
|
|
|
};
|
|
|
|
|
2005-11-17 13:59:38 +01:00
|
|
|
static int snd_pcm_ioctl_channel_info_compat(struct snd_pcm_substream *substream,
|
|
|
|
struct snd_pcm_channel_info32 __user *src)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_pcm_channel_info info;
|
2005-04-17 00:20:36 +02:00
|
|
|
int err;
|
|
|
|
|
|
|
|
if (get_user(info.channel, &src->channel) ||
|
|
|
|
get_user(info.offset, &src->offset) ||
|
|
|
|
get_user(info.first, &src->first) ||
|
|
|
|
get_user(info.step, &src->step))
|
|
|
|
return -EFAULT;
|
|
|
|
err = snd_pcm_channel_info(substream, &info);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
if (put_user(info.channel, &src->channel) ||
|
|
|
|
put_user(info.offset, &src->offset) ||
|
|
|
|
put_user(info.first, &src->first) ||
|
|
|
|
put_user(info.step, &src->step))
|
|
|
|
return -EFAULT;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2016-02-28 11:23:09 +01:00
|
|
|
#ifdef CONFIG_X86_X32
|
|
|
|
/* X32 ABI has the same struct as x86-64 for snd_pcm_channel_info */
|
|
|
|
static int snd_pcm_channel_info_user(struct snd_pcm_substream *substream,
|
|
|
|
struct snd_pcm_channel_info __user *src);
|
|
|
|
#define snd_pcm_ioctl_channel_info_x32(s, p) \
|
|
|
|
snd_pcm_channel_info_user(s, p)
|
|
|
|
#endif /* CONFIG_X86_X32 */
|
|
|
|
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_pcm_status32 {
|
2005-04-17 00:20:36 +02:00
|
|
|
s32 state;
|
|
|
|
struct compat_timespec trigger_tstamp;
|
|
|
|
struct compat_timespec tstamp;
|
|
|
|
u32 appl_ptr;
|
|
|
|
u32 hw_ptr;
|
|
|
|
s32 delay;
|
|
|
|
u32 avail;
|
|
|
|
u32 avail_max;
|
|
|
|
u32 overrange;
|
|
|
|
s32 suspended_state;
|
2015-02-13 22:14:05 +01:00
|
|
|
u32 audio_tstamp_data;
|
2012-10-22 23:42:15 +02:00
|
|
|
struct compat_timespec audio_tstamp;
|
2015-02-13 22:14:05 +01:00
|
|
|
struct compat_timespec driver_tstamp;
|
|
|
|
u32 audio_tstamp_accuracy;
|
|
|
|
unsigned char reserved[52-2*sizeof(struct compat_timespec)];
|
2005-04-17 00:20:36 +02:00
|
|
|
} __attribute__((packed));
|
|
|
|
|
|
|
|
|
2005-11-17 13:59:38 +01:00
|
|
|
static int snd_pcm_status_user_compat(struct snd_pcm_substream *substream,
|
2015-02-13 22:14:05 +01:00
|
|
|
struct snd_pcm_status32 __user *src,
|
|
|
|
bool ext)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_pcm_status status;
|
2005-04-17 00:20:36 +02:00
|
|
|
int err;
|
|
|
|
|
2015-02-13 22:14:05 +01:00
|
|
|
memset(&status, 0, sizeof(status));
|
|
|
|
/*
|
|
|
|
* with extension, parameters are read/write,
|
|
|
|
* get audio_tstamp_data from user,
|
|
|
|
* ignore rest of status structure
|
|
|
|
*/
|
|
|
|
if (ext && get_user(status.audio_tstamp_data,
|
|
|
|
(u32 __user *)(&src->audio_tstamp_data)))
|
|
|
|
return -EFAULT;
|
2005-04-17 00:20:36 +02:00
|
|
|
err = snd_pcm_status(substream, &status);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
2014-10-28 12:42:19 +01:00
|
|
|
if (clear_user(src, sizeof(*src)))
|
|
|
|
return -EFAULT;
|
2005-04-17 00:20:36 +02:00
|
|
|
if (put_user(status.state, &src->state) ||
|
2012-10-22 23:42:15 +02:00
|
|
|
compat_put_timespec(&status.trigger_tstamp, &src->trigger_tstamp) ||
|
|
|
|
compat_put_timespec(&status.tstamp, &src->tstamp) ||
|
2005-04-17 00:20:36 +02:00
|
|
|
put_user(status.appl_ptr, &src->appl_ptr) ||
|
|
|
|
put_user(status.hw_ptr, &src->hw_ptr) ||
|
|
|
|
put_user(status.delay, &src->delay) ||
|
|
|
|
put_user(status.avail, &src->avail) ||
|
|
|
|
put_user(status.avail_max, &src->avail_max) ||
|
|
|
|
put_user(status.overrange, &src->overrange) ||
|
2012-10-22 23:42:15 +02:00
|
|
|
put_user(status.suspended_state, &src->suspended_state) ||
|
2015-02-13 22:14:05 +01:00
|
|
|
put_user(status.audio_tstamp_data, &src->audio_tstamp_data) ||
|
|
|
|
compat_put_timespec(&status.audio_tstamp, &src->audio_tstamp) ||
|
|
|
|
compat_put_timespec(&status.driver_tstamp, &src->driver_tstamp) ||
|
|
|
|
put_user(status.audio_tstamp_accuracy, &src->audio_tstamp_accuracy))
|
2005-04-17 00:20:36 +02:00
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2016-02-28 11:23:09 +01:00
|
|
|
#ifdef CONFIG_X86_X32
|
|
|
|
/* X32 ABI has 64bit timespec and 64bit alignment */
|
|
|
|
struct snd_pcm_status_x32 {
|
|
|
|
s32 state;
|
|
|
|
u32 rsvd; /* alignment */
|
|
|
|
struct timespec trigger_tstamp;
|
|
|
|
struct timespec tstamp;
|
|
|
|
u32 appl_ptr;
|
|
|
|
u32 hw_ptr;
|
|
|
|
s32 delay;
|
|
|
|
u32 avail;
|
|
|
|
u32 avail_max;
|
|
|
|
u32 overrange;
|
|
|
|
s32 suspended_state;
|
|
|
|
u32 audio_tstamp_data;
|
|
|
|
struct timespec audio_tstamp;
|
|
|
|
struct timespec driver_tstamp;
|
|
|
|
u32 audio_tstamp_accuracy;
|
|
|
|
unsigned char reserved[52-2*sizeof(struct timespec)];
|
|
|
|
} __packed;
|
|
|
|
|
|
|
|
#define put_timespec(src, dst) copy_to_user(dst, src, sizeof(*dst))
|
|
|
|
|
|
|
|
static int snd_pcm_status_user_x32(struct snd_pcm_substream *substream,
|
|
|
|
struct snd_pcm_status_x32 __user *src,
|
|
|
|
bool ext)
|
|
|
|
{
|
|
|
|
struct snd_pcm_status status;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
memset(&status, 0, sizeof(status));
|
|
|
|
/*
|
|
|
|
* with extension, parameters are read/write,
|
|
|
|
* get audio_tstamp_data from user,
|
|
|
|
* ignore rest of status structure
|
|
|
|
*/
|
|
|
|
if (ext && get_user(status.audio_tstamp_data,
|
|
|
|
(u32 __user *)(&src->audio_tstamp_data)))
|
|
|
|
return -EFAULT;
|
|
|
|
err = snd_pcm_status(substream, &status);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
if (clear_user(src, sizeof(*src)))
|
|
|
|
return -EFAULT;
|
|
|
|
if (put_user(status.state, &src->state) ||
|
|
|
|
put_timespec(&status.trigger_tstamp, &src->trigger_tstamp) ||
|
|
|
|
put_timespec(&status.tstamp, &src->tstamp) ||
|
|
|
|
put_user(status.appl_ptr, &src->appl_ptr) ||
|
|
|
|
put_user(status.hw_ptr, &src->hw_ptr) ||
|
|
|
|
put_user(status.delay, &src->delay) ||
|
|
|
|
put_user(status.avail, &src->avail) ||
|
|
|
|
put_user(status.avail_max, &src->avail_max) ||
|
|
|
|
put_user(status.overrange, &src->overrange) ||
|
|
|
|
put_user(status.suspended_state, &src->suspended_state) ||
|
|
|
|
put_user(status.audio_tstamp_data, &src->audio_tstamp_data) ||
|
|
|
|
put_timespec(&status.audio_tstamp, &src->audio_tstamp) ||
|
|
|
|
put_timespec(&status.driver_tstamp, &src->driver_tstamp) ||
|
|
|
|
put_user(status.audio_tstamp_accuracy, &src->audio_tstamp_accuracy))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_X86_X32 */
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
/* both for HW_PARAMS and HW_REFINE */
|
2005-11-17 13:59:38 +01:00
|
|
|
static int snd_pcm_ioctl_hw_params_compat(struct snd_pcm_substream *substream,
|
2005-04-17 00:20:36 +02:00
|
|
|
int refine,
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_pcm_hw_params32 __user *data32)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_pcm_hw_params *data;
|
|
|
|
struct snd_pcm_runtime *runtime;
|
2005-04-17 00:20:36 +02:00
|
|
|
int err;
|
|
|
|
|
|
|
|
if (! (runtime = substream->runtime))
|
|
|
|
return -ENOTTY;
|
|
|
|
|
2016-01-18 14:35:00 +01:00
|
|
|
data = kmalloc(sizeof(*data), GFP_KERNEL);
|
|
|
|
if (!data)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
/* only fifo_size (RO from userspace) is different, so just copy all */
|
|
|
|
if (copy_from_user(data, data32, sizeof(*data32))) {
|
|
|
|
err = -EFAULT;
|
|
|
|
goto error;
|
|
|
|
}
|
2009-04-10 03:43:08 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (refine)
|
|
|
|
err = snd_pcm_hw_refine(substream, data);
|
|
|
|
else
|
|
|
|
err = snd_pcm_hw_params(substream, data);
|
|
|
|
if (err < 0)
|
|
|
|
goto error;
|
|
|
|
if (copy_to_user(data32, data, sizeof(*data32)) ||
|
|
|
|
put_user(data->fifo_size, &data32->fifo_size)) {
|
|
|
|
err = -EFAULT;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2005-08-25 19:51:47 +02:00
|
|
|
if (! refine) {
|
|
|
|
unsigned int new_boundary = recalculate_boundary(runtime);
|
|
|
|
if (new_boundary)
|
|
|
|
runtime->boundary = new_boundary;
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
error:
|
|
|
|
kfree(data);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
*/
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_xferi32 {
|
2005-04-17 00:20:36 +02:00
|
|
|
s32 result;
|
|
|
|
u32 buf;
|
|
|
|
u32 frames;
|
|
|
|
};
|
|
|
|
|
2005-11-17 13:59:38 +01:00
|
|
|
static int snd_pcm_ioctl_xferi_compat(struct snd_pcm_substream *substream,
|
|
|
|
int dir, struct snd_xferi32 __user *data32)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
compat_caddr_t buf;
|
|
|
|
u32 frames;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (! substream->runtime)
|
|
|
|
return -ENOTTY;
|
|
|
|
if (substream->stream != dir)
|
|
|
|
return -EINVAL;
|
|
|
|
if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN)
|
|
|
|
return -EBADFD;
|
|
|
|
|
|
|
|
if (get_user(buf, &data32->buf) ||
|
|
|
|
get_user(frames, &data32->frames))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
if (dir == SNDRV_PCM_STREAM_PLAYBACK)
|
|
|
|
err = snd_pcm_lib_write(substream, compat_ptr(buf), frames);
|
|
|
|
else
|
|
|
|
err = snd_pcm_lib_read(substream, compat_ptr(buf), frames);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
/* copy the result */
|
|
|
|
if (put_user(err, &data32->result))
|
|
|
|
return -EFAULT;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* snd_xfern needs remapping of bufs */
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_xfern32 {
|
2005-04-17 00:20:36 +02:00
|
|
|
s32 result;
|
|
|
|
u32 bufs; /* this is void **; */
|
|
|
|
u32 frames;
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* xfern ioctl nees to copy (up to) 128 pointers on stack.
|
|
|
|
* although we may pass the copied pointers through f_op->ioctl, but the ioctl
|
|
|
|
* handler there expands again the same 128 pointers on stack, so it is better
|
|
|
|
* to handle the function (calling pcm_readv/writev) directly in this handler.
|
|
|
|
*/
|
2005-11-17 13:59:38 +01:00
|
|
|
static int snd_pcm_ioctl_xfern_compat(struct snd_pcm_substream *substream,
|
|
|
|
int dir, struct snd_xfern32 __user *data32)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
compat_caddr_t buf;
|
|
|
|
compat_caddr_t __user *bufptr;
|
|
|
|
u32 frames;
|
|
|
|
void __user **bufs;
|
|
|
|
int err, ch, i;
|
|
|
|
|
|
|
|
if (! substream->runtime)
|
|
|
|
return -ENOTTY;
|
|
|
|
if (substream->stream != dir)
|
|
|
|
return -EINVAL;
|
2018-05-02 08:48:46 +02:00
|
|
|
if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN)
|
|
|
|
return -EBADFD;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if ((ch = substream->runtime->channels) > 128)
|
|
|
|
return -EINVAL;
|
|
|
|
if (get_user(buf, &data32->bufs) ||
|
|
|
|
get_user(frames, &data32->frames))
|
|
|
|
return -EFAULT;
|
|
|
|
bufptr = compat_ptr(buf);
|
treewide: kmalloc() -> kmalloc_array()
The kmalloc() function has a 2-factor argument form, kmalloc_array(). This
patch replaces cases of:
kmalloc(a * b, gfp)
with:
kmalloc_array(a * b, gfp)
as well as handling cases of:
kmalloc(a * b * c, gfp)
with:
kmalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kmalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kmalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The tools/ directory was manually excluded, since it has its own
implementation of kmalloc().
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kmalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kmalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kmalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kmalloc
+ kmalloc_array
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kmalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kmalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kmalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kmalloc(sizeof(THING) * C2, ...)
|
kmalloc(sizeof(TYPE) * C2, ...)
|
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(C1 * C2, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * E2
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-12 22:55:00 +02:00
|
|
|
bufs = kmalloc_array(ch, sizeof(void __user *), GFP_KERNEL);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (bufs == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
for (i = 0; i < ch; i++) {
|
|
|
|
u32 ptr;
|
|
|
|
if (get_user(ptr, bufptr)) {
|
|
|
|
kfree(bufs);
|
|
|
|
return -EFAULT;
|
|
|
|
}
|
2011-07-28 14:46:05 +02:00
|
|
|
bufs[i] = compat_ptr(ptr);
|
2005-04-17 00:20:36 +02:00
|
|
|
bufptr++;
|
|
|
|
}
|
|
|
|
if (dir == SNDRV_PCM_STREAM_PLAYBACK)
|
|
|
|
err = snd_pcm_lib_writev(substream, bufs, frames);
|
|
|
|
else
|
|
|
|
err = snd_pcm_lib_readv(substream, bufs, frames);
|
|
|
|
if (err >= 0) {
|
|
|
|
if (put_user(err, &data32->result))
|
|
|
|
err = -EFAULT;
|
|
|
|
}
|
|
|
|
kfree(bufs);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_pcm_mmap_status32 {
|
2005-04-17 00:20:36 +02:00
|
|
|
s32 state;
|
|
|
|
s32 pad1;
|
|
|
|
u32 hw_ptr;
|
|
|
|
struct compat_timespec tstamp;
|
|
|
|
s32 suspended_state;
|
2012-10-22 23:42:15 +02:00
|
|
|
struct compat_timespec audio_tstamp;
|
2005-04-17 00:20:36 +02:00
|
|
|
} __attribute__((packed));
|
|
|
|
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_pcm_mmap_control32 {
|
2005-04-17 00:20:36 +02:00
|
|
|
u32 appl_ptr;
|
|
|
|
u32 avail_min;
|
|
|
|
};
|
|
|
|
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_pcm_sync_ptr32 {
|
2005-04-17 00:20:36 +02:00
|
|
|
u32 flags;
|
|
|
|
union {
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_pcm_mmap_status32 status;
|
2005-04-17 00:20:36 +02:00
|
|
|
unsigned char reserved[64];
|
|
|
|
} s;
|
|
|
|
union {
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_pcm_mmap_control32 control;
|
2005-04-17 00:20:36 +02:00
|
|
|
unsigned char reserved[64];
|
|
|
|
} c;
|
|
|
|
} __attribute__((packed));
|
|
|
|
|
2005-11-17 13:59:38 +01:00
|
|
|
static int snd_pcm_ioctl_sync_ptr_compat(struct snd_pcm_substream *substream,
|
|
|
|
struct snd_pcm_sync_ptr32 __user *src)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
|
|
volatile struct snd_pcm_mmap_status *status;
|
|
|
|
volatile struct snd_pcm_mmap_control *control;
|
2005-04-17 00:20:36 +02:00
|
|
|
u32 sflags;
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_pcm_mmap_control scontrol;
|
|
|
|
struct snd_pcm_mmap_status sstatus;
|
2005-08-15 15:01:10 +02:00
|
|
|
snd_pcm_uframes_t boundary;
|
2005-04-17 00:20:36 +02:00
|
|
|
int err;
|
|
|
|
|
2008-08-08 17:09:09 +02:00
|
|
|
if (snd_BUG_ON(!runtime))
|
|
|
|
return -EINVAL;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (get_user(sflags, &src->flags) ||
|
|
|
|
get_user(scontrol.appl_ptr, &src->c.control.appl_ptr) ||
|
|
|
|
get_user(scontrol.avail_min, &src->c.control.avail_min))
|
|
|
|
return -EFAULT;
|
|
|
|
if (sflags & SNDRV_PCM_SYNC_PTR_HWSYNC) {
|
|
|
|
err = snd_pcm_hwsync(substream);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
status = runtime->status;
|
|
|
|
control = runtime->control;
|
2005-08-15 15:01:10 +02:00
|
|
|
boundary = recalculate_boundary(runtime);
|
2005-08-25 19:51:47 +02:00
|
|
|
if (! boundary)
|
|
|
|
boundary = 0x7fffffff;
|
2005-04-17 00:20:36 +02:00
|
|
|
snd_pcm_stream_lock_irq(substream);
|
2005-08-15 15:01:10 +02:00
|
|
|
/* FIXME: we should consider the boundary for the sync from app */
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!(sflags & SNDRV_PCM_SYNC_PTR_APPL))
|
|
|
|
control->appl_ptr = scontrol.appl_ptr;
|
|
|
|
else
|
2005-08-15 15:01:10 +02:00
|
|
|
scontrol.appl_ptr = control->appl_ptr % boundary;
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!(sflags & SNDRV_PCM_SYNC_PTR_AVAIL_MIN))
|
|
|
|
control->avail_min = scontrol.avail_min;
|
|
|
|
else
|
|
|
|
scontrol.avail_min = control->avail_min;
|
|
|
|
sstatus.state = status->state;
|
2005-08-15 15:01:10 +02:00
|
|
|
sstatus.hw_ptr = status->hw_ptr % boundary;
|
2005-04-17 00:20:36 +02:00
|
|
|
sstatus.tstamp = status->tstamp;
|
|
|
|
sstatus.suspended_state = status->suspended_state;
|
2012-10-22 23:42:15 +02:00
|
|
|
sstatus.audio_tstamp = status->audio_tstamp;
|
2005-04-17 00:20:36 +02:00
|
|
|
snd_pcm_stream_unlock_irq(substream);
|
|
|
|
if (put_user(sstatus.state, &src->s.status.state) ||
|
|
|
|
put_user(sstatus.hw_ptr, &src->s.status.hw_ptr) ||
|
2012-10-22 23:42:15 +02:00
|
|
|
compat_put_timespec(&sstatus.tstamp, &src->s.status.tstamp) ||
|
2005-04-17 00:20:36 +02:00
|
|
|
put_user(sstatus.suspended_state, &src->s.status.suspended_state) ||
|
2012-10-22 23:42:15 +02:00
|
|
|
compat_put_timespec(&sstatus.audio_tstamp,
|
|
|
|
&src->s.status.audio_tstamp) ||
|
2005-04-17 00:20:36 +02:00
|
|
|
put_user(scontrol.appl_ptr, &src->c.control.appl_ptr) ||
|
|
|
|
put_user(scontrol.avail_min, &src->c.control.avail_min))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-02-28 11:23:09 +01:00
|
|
|
#ifdef CONFIG_X86_X32
|
|
|
|
/* X32 ABI has 64bit timespec and 64bit alignment */
|
|
|
|
struct snd_pcm_mmap_status_x32 {
|
|
|
|
s32 state;
|
|
|
|
s32 pad1;
|
|
|
|
u32 hw_ptr;
|
|
|
|
u32 pad2; /* alignment */
|
|
|
|
struct timespec tstamp;
|
|
|
|
s32 suspended_state;
|
2017-09-21 08:03:29 +02:00
|
|
|
s32 pad3;
|
2016-02-28 11:23:09 +01:00
|
|
|
struct timespec audio_tstamp;
|
|
|
|
} __packed;
|
|
|
|
|
|
|
|
struct snd_pcm_mmap_control_x32 {
|
|
|
|
u32 appl_ptr;
|
|
|
|
u32 avail_min;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct snd_pcm_sync_ptr_x32 {
|
|
|
|
u32 flags;
|
|
|
|
u32 rsvd; /* alignment */
|
|
|
|
union {
|
|
|
|
struct snd_pcm_mmap_status_x32 status;
|
|
|
|
unsigned char reserved[64];
|
|
|
|
} s;
|
|
|
|
union {
|
|
|
|
struct snd_pcm_mmap_control_x32 control;
|
|
|
|
unsigned char reserved[64];
|
|
|
|
} c;
|
|
|
|
} __packed;
|
|
|
|
|
|
|
|
static int snd_pcm_ioctl_sync_ptr_x32(struct snd_pcm_substream *substream,
|
|
|
|
struct snd_pcm_sync_ptr_x32 __user *src)
|
|
|
|
{
|
|
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
|
|
volatile struct snd_pcm_mmap_status *status;
|
|
|
|
volatile struct snd_pcm_mmap_control *control;
|
|
|
|
u32 sflags;
|
|
|
|
struct snd_pcm_mmap_control scontrol;
|
|
|
|
struct snd_pcm_mmap_status sstatus;
|
|
|
|
snd_pcm_uframes_t boundary;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (snd_BUG_ON(!runtime))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (get_user(sflags, &src->flags) ||
|
|
|
|
get_user(scontrol.appl_ptr, &src->c.control.appl_ptr) ||
|
|
|
|
get_user(scontrol.avail_min, &src->c.control.avail_min))
|
|
|
|
return -EFAULT;
|
|
|
|
if (sflags & SNDRV_PCM_SYNC_PTR_HWSYNC) {
|
|
|
|
err = snd_pcm_hwsync(substream);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
status = runtime->status;
|
|
|
|
control = runtime->control;
|
|
|
|
boundary = recalculate_boundary(runtime);
|
|
|
|
if (!boundary)
|
|
|
|
boundary = 0x7fffffff;
|
|
|
|
snd_pcm_stream_lock_irq(substream);
|
|
|
|
/* FIXME: we should consider the boundary for the sync from app */
|
|
|
|
if (!(sflags & SNDRV_PCM_SYNC_PTR_APPL))
|
|
|
|
control->appl_ptr = scontrol.appl_ptr;
|
|
|
|
else
|
|
|
|
scontrol.appl_ptr = control->appl_ptr % boundary;
|
|
|
|
if (!(sflags & SNDRV_PCM_SYNC_PTR_AVAIL_MIN))
|
|
|
|
control->avail_min = scontrol.avail_min;
|
|
|
|
else
|
|
|
|
scontrol.avail_min = control->avail_min;
|
|
|
|
sstatus.state = status->state;
|
|
|
|
sstatus.hw_ptr = status->hw_ptr % boundary;
|
|
|
|
sstatus.tstamp = status->tstamp;
|
|
|
|
sstatus.suspended_state = status->suspended_state;
|
|
|
|
sstatus.audio_tstamp = status->audio_tstamp;
|
|
|
|
snd_pcm_stream_unlock_irq(substream);
|
|
|
|
if (put_user(sstatus.state, &src->s.status.state) ||
|
|
|
|
put_user(sstatus.hw_ptr, &src->s.status.hw_ptr) ||
|
|
|
|
put_timespec(&sstatus.tstamp, &src->s.status.tstamp) ||
|
|
|
|
put_user(sstatus.suspended_state, &src->s.status.suspended_state) ||
|
|
|
|
put_timespec(&sstatus.audio_tstamp, &src->s.status.audio_tstamp) ||
|
|
|
|
put_user(scontrol.appl_ptr, &src->c.control.appl_ptr) ||
|
|
|
|
put_user(scontrol.avail_min, &src->c.control.avail_min))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_X86_X32 */
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
*/
|
|
|
|
enum {
|
2005-11-17 13:59:38 +01:00
|
|
|
SNDRV_PCM_IOCTL_HW_REFINE32 = _IOWR('A', 0x10, struct snd_pcm_hw_params32),
|
|
|
|
SNDRV_PCM_IOCTL_HW_PARAMS32 = _IOWR('A', 0x11, struct snd_pcm_hw_params32),
|
|
|
|
SNDRV_PCM_IOCTL_SW_PARAMS32 = _IOWR('A', 0x13, struct snd_pcm_sw_params32),
|
|
|
|
SNDRV_PCM_IOCTL_STATUS32 = _IOR('A', 0x20, struct snd_pcm_status32),
|
2015-02-13 22:14:05 +01:00
|
|
|
SNDRV_PCM_IOCTL_STATUS_EXT32 = _IOWR('A', 0x24, struct snd_pcm_status32),
|
2005-04-17 00:20:36 +02:00
|
|
|
SNDRV_PCM_IOCTL_DELAY32 = _IOR('A', 0x21, s32),
|
2005-11-17 13:59:38 +01:00
|
|
|
SNDRV_PCM_IOCTL_CHANNEL_INFO32 = _IOR('A', 0x32, struct snd_pcm_channel_info32),
|
2005-04-17 00:20:36 +02:00
|
|
|
SNDRV_PCM_IOCTL_REWIND32 = _IOW('A', 0x46, u32),
|
|
|
|
SNDRV_PCM_IOCTL_FORWARD32 = _IOW('A', 0x49, u32),
|
2005-11-17 13:59:38 +01:00
|
|
|
SNDRV_PCM_IOCTL_WRITEI_FRAMES32 = _IOW('A', 0x50, struct snd_xferi32),
|
|
|
|
SNDRV_PCM_IOCTL_READI_FRAMES32 = _IOR('A', 0x51, struct snd_xferi32),
|
|
|
|
SNDRV_PCM_IOCTL_WRITEN_FRAMES32 = _IOW('A', 0x52, struct snd_xfern32),
|
|
|
|
SNDRV_PCM_IOCTL_READN_FRAMES32 = _IOR('A', 0x53, struct snd_xfern32),
|
|
|
|
SNDRV_PCM_IOCTL_SYNC_PTR32 = _IOWR('A', 0x23, struct snd_pcm_sync_ptr32),
|
2016-02-28 11:23:09 +01:00
|
|
|
#ifdef CONFIG_X86_X32
|
|
|
|
SNDRV_PCM_IOCTL_CHANNEL_INFO_X32 = _IOR('A', 0x32, struct snd_pcm_channel_info),
|
|
|
|
SNDRV_PCM_IOCTL_STATUS_X32 = _IOR('A', 0x20, struct snd_pcm_status_x32),
|
|
|
|
SNDRV_PCM_IOCTL_STATUS_EXT_X32 = _IOWR('A', 0x24, struct snd_pcm_status_x32),
|
|
|
|
SNDRV_PCM_IOCTL_SYNC_PTR_X32 = _IOWR('A', 0x23, struct snd_pcm_sync_ptr_x32),
|
|
|
|
#endif /* CONFIG_X86_X32 */
|
2005-04-17 00:20:36 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
static long snd_pcm_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg)
|
|
|
|
{
|
2005-11-17 13:59:38 +01:00
|
|
|
struct snd_pcm_file *pcm_file;
|
|
|
|
struct snd_pcm_substream *substream;
|
2005-04-17 00:20:36 +02:00
|
|
|
void __user *argp = compat_ptr(arg);
|
|
|
|
|
|
|
|
pcm_file = file->private_data;
|
|
|
|
if (! pcm_file)
|
|
|
|
return -ENOTTY;
|
|
|
|
substream = pcm_file->substream;
|
|
|
|
if (! substream)
|
|
|
|
return -ENOTTY;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* When PCM is used on 32bit mode, we need to disable
|
|
|
|
* mmap of PCM status/control records because of the size
|
|
|
|
* incompatibility.
|
|
|
|
*/
|
2006-07-31 16:51:51 +02:00
|
|
|
pcm_file->no_compat_mmap = 1;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
case SNDRV_PCM_IOCTL_PVERSION:
|
|
|
|
case SNDRV_PCM_IOCTL_INFO:
|
2007-12-17 11:44:25 +01:00
|
|
|
case SNDRV_PCM_IOCTL_TSTAMP:
|
2007-12-14 12:10:26 +01:00
|
|
|
case SNDRV_PCM_IOCTL_TTSTAMP:
|
ALSA: pcm: Add an ioctl to specify the supported protocol version
We have an ioctl to inform the PCM protocol version the running kernel
supports, but there is no way to know which protocol version the
user-space can understand. This lack of information caused headaches
in the past when we tried to extend the ABI. For example, because we
couldn't guarantee the validity of the reserved bytes, we had to
introduce a new ioctl SNDRV_PCM_IOCTL_STATUS_EXT for assigning a few
new fields in the formerly reserved bits. If we could know that it's
a new alsa-lib, we could assume the availability of the new fields,
thus we could have reused the existing SNDRV_PCM_IOCTL_STATUS.
In order to improve the ABI extensibility, this patch adds a new ioctl
for user-space to inform its supporting protocol version to the
kernel. By reporting the supported protocol from user-space, the
kernel can judge which feature should be provided and which not.
With the addition of the new ioctl, the PCM protocol version is bumped
to 2.0.14, too. User-space checks the kernel protocol version via
SNDRV_PCM_INFO_PVERSION, then it sets the supported version back via
SNDRV_PCM_INFO_USER_PVERSION.
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2017-06-19 23:11:54 +02:00
|
|
|
case SNDRV_PCM_IOCTL_USER_PVERSION:
|
2005-04-17 00:20:36 +02:00
|
|
|
case SNDRV_PCM_IOCTL_HWSYNC:
|
|
|
|
case SNDRV_PCM_IOCTL_PREPARE:
|
|
|
|
case SNDRV_PCM_IOCTL_RESET:
|
|
|
|
case SNDRV_PCM_IOCTL_START:
|
|
|
|
case SNDRV_PCM_IOCTL_DROP:
|
|
|
|
case SNDRV_PCM_IOCTL_DRAIN:
|
|
|
|
case SNDRV_PCM_IOCTL_PAUSE:
|
|
|
|
case SNDRV_PCM_IOCTL_HW_FREE:
|
|
|
|
case SNDRV_PCM_IOCTL_RESUME:
|
|
|
|
case SNDRV_PCM_IOCTL_XRUN:
|
|
|
|
case SNDRV_PCM_IOCTL_LINK:
|
|
|
|
case SNDRV_PCM_IOCTL_UNLINK:
|
2017-08-30 15:39:32 +02:00
|
|
|
return snd_pcm_common_ioctl(file, substream, cmd, argp);
|
2005-04-17 00:20:36 +02:00
|
|
|
case SNDRV_PCM_IOCTL_HW_REFINE32:
|
|
|
|
return snd_pcm_ioctl_hw_params_compat(substream, 1, argp);
|
|
|
|
case SNDRV_PCM_IOCTL_HW_PARAMS32:
|
|
|
|
return snd_pcm_ioctl_hw_params_compat(substream, 0, argp);
|
|
|
|
case SNDRV_PCM_IOCTL_SW_PARAMS32:
|
|
|
|
return snd_pcm_ioctl_sw_params_compat(substream, argp);
|
|
|
|
case SNDRV_PCM_IOCTL_STATUS32:
|
2015-02-13 22:14:05 +01:00
|
|
|
return snd_pcm_status_user_compat(substream, argp, false);
|
|
|
|
case SNDRV_PCM_IOCTL_STATUS_EXT32:
|
|
|
|
return snd_pcm_status_user_compat(substream, argp, true);
|
2005-04-17 00:20:36 +02:00
|
|
|
case SNDRV_PCM_IOCTL_SYNC_PTR32:
|
|
|
|
return snd_pcm_ioctl_sync_ptr_compat(substream, argp);
|
|
|
|
case SNDRV_PCM_IOCTL_CHANNEL_INFO32:
|
|
|
|
return snd_pcm_ioctl_channel_info_compat(substream, argp);
|
|
|
|
case SNDRV_PCM_IOCTL_WRITEI_FRAMES32:
|
|
|
|
return snd_pcm_ioctl_xferi_compat(substream, SNDRV_PCM_STREAM_PLAYBACK, argp);
|
|
|
|
case SNDRV_PCM_IOCTL_READI_FRAMES32:
|
|
|
|
return snd_pcm_ioctl_xferi_compat(substream, SNDRV_PCM_STREAM_CAPTURE, argp);
|
|
|
|
case SNDRV_PCM_IOCTL_WRITEN_FRAMES32:
|
|
|
|
return snd_pcm_ioctl_xfern_compat(substream, SNDRV_PCM_STREAM_PLAYBACK, argp);
|
|
|
|
case SNDRV_PCM_IOCTL_READN_FRAMES32:
|
|
|
|
return snd_pcm_ioctl_xfern_compat(substream, SNDRV_PCM_STREAM_CAPTURE, argp);
|
|
|
|
case SNDRV_PCM_IOCTL_DELAY32:
|
|
|
|
return snd_pcm_ioctl_delay_compat(substream, argp);
|
|
|
|
case SNDRV_PCM_IOCTL_REWIND32:
|
|
|
|
return snd_pcm_ioctl_rewind_compat(substream, argp);
|
|
|
|
case SNDRV_PCM_IOCTL_FORWARD32:
|
|
|
|
return snd_pcm_ioctl_forward_compat(substream, argp);
|
2016-02-28 11:23:09 +01:00
|
|
|
#ifdef CONFIG_X86_X32
|
|
|
|
case SNDRV_PCM_IOCTL_STATUS_X32:
|
|
|
|
return snd_pcm_status_user_x32(substream, argp, false);
|
|
|
|
case SNDRV_PCM_IOCTL_STATUS_EXT_X32:
|
|
|
|
return snd_pcm_status_user_x32(substream, argp, true);
|
|
|
|
case SNDRV_PCM_IOCTL_SYNC_PTR_X32:
|
|
|
|
return snd_pcm_ioctl_sync_ptr_x32(substream, argp);
|
|
|
|
case SNDRV_PCM_IOCTL_CHANNEL_INFO_X32:
|
|
|
|
return snd_pcm_ioctl_channel_info_x32(substream, argp);
|
|
|
|
#endif /* CONFIG_X86_X32 */
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return -ENOIOCTLCMD;
|
|
|
|
}
|