2019-05-27 09:55:05 +03:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
2005-04-17 02:20:36 +04: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 11:04:11 +03:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2005-11-17 15:59:38 +03:00
|
|
|
static int snd_pcm_ioctl_delay_compat(struct snd_pcm_substream *substream,
|
2005-04-17 02:20:36 +04:00
|
|
|
s32 __user *src)
|
|
|
|
{
|
|
|
|
snd_pcm_sframes_t delay;
|
2018-04-21 07:20:46 +03:00
|
|
|
int err;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2018-04-21 07:20:46 +03:00
|
|
|
err = snd_pcm_delay(substream, &delay);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2005-04-17 02:20:36 +04:00
|
|
|
if (put_user(delay, src))
|
|
|
|
return -EFAULT;
|
2017-05-10 15:33:44 +03:00
|
|
|
return 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2005-11-17 15:59:38 +03:00
|
|
|
static int snd_pcm_ioctl_rewind_compat(struct snd_pcm_substream *substream,
|
2005-04-17 02:20:36 +04:00
|
|
|
u32 __user *src)
|
|
|
|
{
|
|
|
|
snd_pcm_uframes_t frames;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (get_user(frames, src))
|
|
|
|
return -EFAULT;
|
2018-04-11 18:56:52 +03:00
|
|
|
err = snd_pcm_rewind(substream, frames);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (put_user(err, src))
|
|
|
|
return -EFAULT;
|
|
|
|
return err < 0 ? err : 0;
|
|
|
|
}
|
|
|
|
|
2005-11-17 15:59:38 +03:00
|
|
|
static int snd_pcm_ioctl_forward_compat(struct snd_pcm_substream *substream,
|
2005-04-17 02:20:36 +04:00
|
|
|
u32 __user *src)
|
|
|
|
{
|
|
|
|
snd_pcm_uframes_t frames;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (get_user(frames, src))
|
|
|
|
return -EFAULT;
|
2018-04-11 18:56:52 +03:00
|
|
|
err = snd_pcm_forward(substream, frames);
|
2005-04-17 02:20:36 +04:00
|
|
|
if (put_user(err, src))
|
|
|
|
return -EFAULT;
|
|
|
|
return err < 0 ? err : 0;
|
|
|
|
}
|
|
|
|
|
2005-11-17 15:59:38 +03:00
|
|
|
struct snd_pcm_hw_params32 {
|
2005-04-17 02:20:36 +04:00
|
|
|
u32 flags;
|
2005-11-17 15:59:38 +03: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 02:20:36 +04: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 15:59:38 +03:00
|
|
|
struct snd_pcm_sw_params32 {
|
2005-04-17 02:20:36 +04: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 20:07:30 +04:00
|
|
|
u32 proto;
|
|
|
|
u32 tstamp_type;
|
|
|
|
unsigned char reserved[56];
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
|
|
|
|
2005-11-17 15:59:38 +03:00
|
|
|
static int snd_pcm_ioctl_sw_params_compat(struct snd_pcm_substream *substream,
|
|
|
|
struct snd_pcm_sw_params32 __user *src)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2005-11-17 15:59:38 +03:00
|
|
|
struct snd_pcm_sw_params params;
|
2005-08-15 17:01:10 +04:00
|
|
|
snd_pcm_uframes_t boundary;
|
2005-04-17 02:20:36 +04: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 20:07:30 +04: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 02:20:36 +04:00
|
|
|
return -EFAULT;
|
2005-08-15 17:01:10 +04: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 02:20:36 +04:00
|
|
|
err = snd_pcm_sw_params(substream, ¶ms);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
2005-08-25 21:51:47 +04:00
|
|
|
if (boundary && put_user(boundary, &src->boundary))
|
2005-04-17 02:20:36 +04:00
|
|
|
return -EFAULT;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2005-11-17 15:59:38 +03:00
|
|
|
struct snd_pcm_channel_info32 {
|
2005-04-17 02:20:36 +04:00
|
|
|
u32 channel;
|
|
|
|
u32 offset;
|
|
|
|
u32 first;
|
|
|
|
u32 step;
|
|
|
|
};
|
|
|
|
|
2005-11-17 15:59:38 +03:00
|
|
|
static int snd_pcm_ioctl_channel_info_compat(struct snd_pcm_substream *substream,
|
|
|
|
struct snd_pcm_channel_info32 __user *src)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2005-11-17 15:59:38 +03:00
|
|
|
struct snd_pcm_channel_info info;
|
2005-04-17 02:20:36 +04: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;
|
|
|
|
}
|
|
|
|
|
2022-03-14 22:48:41 +03:00
|
|
|
#ifdef CONFIG_X86_X32_ABI
|
2016-02-28 13:23:09 +03:00
|
|
|
/* 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)
|
2022-03-14 22:48:41 +03:00
|
|
|
#endif /* CONFIG_X86_X32_ABI */
|
2016-02-28 13:23:09 +03:00
|
|
|
|
2018-04-24 15:06:11 +03:00
|
|
|
struct compat_snd_pcm_status64 {
|
2020-01-31 18:22:14 +03:00
|
|
|
snd_pcm_state_t state;
|
2018-04-24 15:06:11 +03:00
|
|
|
u8 rsvd[4]; /* alignment */
|
|
|
|
s64 trigger_tstamp_sec;
|
|
|
|
s64 trigger_tstamp_nsec;
|
|
|
|
s64 tstamp_sec;
|
|
|
|
s64 tstamp_nsec;
|
2016-02-28 13:23:09 +03:00
|
|
|
u32 appl_ptr;
|
|
|
|
u32 hw_ptr;
|
|
|
|
s32 delay;
|
|
|
|
u32 avail;
|
|
|
|
u32 avail_max;
|
|
|
|
u32 overrange;
|
2020-01-31 18:22:14 +03:00
|
|
|
snd_pcm_state_t suspended_state;
|
2016-02-28 13:23:09 +03:00
|
|
|
u32 audio_tstamp_data;
|
2018-04-24 15:06:11 +03:00
|
|
|
s64 audio_tstamp_sec;
|
|
|
|
s64 audio_tstamp_nsec;
|
|
|
|
s64 driver_tstamp_sec;
|
|
|
|
s64 driver_tstamp_nsec;
|
2016-02-28 13:23:09 +03:00
|
|
|
u32 audio_tstamp_accuracy;
|
2018-04-24 15:06:11 +03:00
|
|
|
unsigned char reserved[52-4*sizeof(s64)];
|
2016-02-28 13:23:09 +03:00
|
|
|
} __packed;
|
|
|
|
|
2018-04-24 15:06:11 +03:00
|
|
|
static int snd_pcm_status_user_compat64(struct snd_pcm_substream *substream,
|
|
|
|
struct compat_snd_pcm_status64 __user *src,
|
|
|
|
bool ext)
|
2016-02-28 13:23:09 +03:00
|
|
|
{
|
2018-04-24 15:06:11 +03:00
|
|
|
struct snd_pcm_status64 status;
|
|
|
|
struct compat_snd_pcm_status64 compat_status64;
|
2016-02-28 13:23:09 +03:00
|
|
|
int err;
|
|
|
|
|
|
|
|
memset(&status, 0, sizeof(status));
|
2018-04-24 15:06:11 +03:00
|
|
|
memset(&compat_status64, 0, sizeof(compat_status64));
|
2016-02-28 13:23:09 +03:00
|
|
|
/*
|
|
|
|
* 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;
|
2018-04-24 15:06:11 +03:00
|
|
|
err = snd_pcm_status64(substream, &status);
|
2016-02-28 13:23:09 +03:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
if (clear_user(src, sizeof(*src)))
|
|
|
|
return -EFAULT;
|
2018-04-24 15:06:11 +03:00
|
|
|
|
|
|
|
compat_status64 = (struct compat_snd_pcm_status64) {
|
|
|
|
.state = status.state,
|
|
|
|
.trigger_tstamp_sec = status.trigger_tstamp_sec,
|
|
|
|
.trigger_tstamp_nsec = status.trigger_tstamp_nsec,
|
|
|
|
.tstamp_sec = status.tstamp_sec,
|
|
|
|
.tstamp_nsec = status.tstamp_nsec,
|
|
|
|
.appl_ptr = status.appl_ptr,
|
|
|
|
.hw_ptr = status.hw_ptr,
|
|
|
|
.delay = status.delay,
|
|
|
|
.avail = status.avail,
|
|
|
|
.avail_max = status.avail_max,
|
|
|
|
.overrange = status.overrange,
|
|
|
|
.suspended_state = status.suspended_state,
|
|
|
|
.audio_tstamp_data = status.audio_tstamp_data,
|
|
|
|
.audio_tstamp_sec = status.audio_tstamp_sec,
|
|
|
|
.audio_tstamp_nsec = status.audio_tstamp_nsec,
|
|
|
|
.driver_tstamp_sec = status.audio_tstamp_sec,
|
|
|
|
.driver_tstamp_nsec = status.audio_tstamp_nsec,
|
|
|
|
.audio_tstamp_accuracy = status.audio_tstamp_accuracy,
|
|
|
|
};
|
|
|
|
|
|
|
|
if (copy_to_user(src, &compat_status64, sizeof(compat_status64)))
|
2016-02-28 13:23:09 +03:00
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* both for HW_PARAMS and HW_REFINE */
|
2005-11-17 15:59:38 +03:00
|
|
|
static int snd_pcm_ioctl_hw_params_compat(struct snd_pcm_substream *substream,
|
2005-04-17 02:20:36 +04:00
|
|
|
int refine,
|
2005-11-17 15:59:38 +03:00
|
|
|
struct snd_pcm_hw_params32 __user *data32)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2005-11-17 15:59:38 +03:00
|
|
|
struct snd_pcm_hw_params *data;
|
|
|
|
struct snd_pcm_runtime *runtime;
|
2005-04-17 02:20:36 +04:00
|
|
|
int err;
|
|
|
|
|
2021-06-08 17:05:28 +03:00
|
|
|
runtime = substream->runtime;
|
|
|
|
if (!runtime)
|
2005-04-17 02:20:36 +04:00
|
|
|
return -ENOTTY;
|
|
|
|
|
2016-01-18 16:35:00 +03: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 05:43:08 +04:00
|
|
|
|
2005-04-17 02:20:36 +04: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 21:51:47 +04:00
|
|
|
if (! refine) {
|
|
|
|
unsigned int new_boundary = recalculate_boundary(runtime);
|
|
|
|
if (new_boundary)
|
|
|
|
runtime->boundary = new_boundary;
|
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
error:
|
|
|
|
kfree(data);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
*/
|
2005-11-17 15:59:38 +03:00
|
|
|
struct snd_xferi32 {
|
2005-04-17 02:20:36 +04:00
|
|
|
s32 result;
|
|
|
|
u32 buf;
|
|
|
|
u32 frames;
|
|
|
|
};
|
|
|
|
|
2005-11-17 15:59:38 +03:00
|
|
|
static int snd_pcm_ioctl_xferi_compat(struct snd_pcm_substream *substream,
|
|
|
|
int dir, struct snd_xferi32 __user *data32)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
compat_caddr_t buf;
|
|
|
|
u32 frames;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (! substream->runtime)
|
|
|
|
return -ENOTTY;
|
|
|
|
if (substream->stream != dir)
|
|
|
|
return -EINVAL;
|
2022-09-26 16:55:48 +03:00
|
|
|
if (substream->runtime->state == SNDRV_PCM_STATE_OPEN)
|
2005-04-17 02:20:36 +04:00
|
|
|
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 15:59:38 +03:00
|
|
|
struct snd_xfern32 {
|
2005-04-17 02:20:36 +04: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 15:59:38 +03:00
|
|
|
static int snd_pcm_ioctl_xfern_compat(struct snd_pcm_substream *substream,
|
|
|
|
int dir, struct snd_xfern32 __user *data32)
|
2005-04-17 02:20:36 +04: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;
|
2022-09-26 16:55:48 +03:00
|
|
|
if (substream->runtime->state == SNDRV_PCM_STATE_OPEN)
|
2018-05-02 09:48:46 +03:00
|
|
|
return -EBADFD;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2021-06-08 17:05:28 +03:00
|
|
|
ch = substream->runtime->channels;
|
|
|
|
if (ch > 128)
|
2005-04-17 02:20:36 +04:00
|
|
|
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 23:55:00 +03:00
|
|
|
bufs = kmalloc_array(ch, sizeof(void __user *), GFP_KERNEL);
|
2005-04-17 02:20:36 +04: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 16:46:05 +04:00
|
|
|
bufs[i] = compat_ptr(ptr);
|
2005-04-17 02:20:36 +04: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;
|
|
|
|
}
|
|
|
|
|
2022-03-14 22:48:41 +03:00
|
|
|
#ifdef CONFIG_X86_X32_ABI
|
2016-02-28 13:23:09 +03:00
|
|
|
/* X32 ABI has 64bit timespec and 64bit alignment */
|
|
|
|
struct snd_pcm_mmap_status_x32 {
|
2020-01-31 18:22:14 +03:00
|
|
|
snd_pcm_state_t state;
|
2016-02-28 13:23:09 +03:00
|
|
|
s32 pad1;
|
|
|
|
u32 hw_ptr;
|
|
|
|
u32 pad2; /* alignment */
|
ALSA: add new 32-bit layout for snd_pcm_mmap_status/control
The snd_pcm_mmap_status and snd_pcm_mmap_control interfaces are one of the
trickiest areas to get right when moving to 64-bit time_t in user space.
The snd_pcm_mmap_status structure layout is incompatible with user space
that uses a 64-bit time_t, so we need a new layout for it. Since the
SNDRV_PCM_IOCTL_SYNC_PTR ioctl combines it with snd_pcm_mmap_control
into snd_pcm_sync_ptr, we need to change those two as well.
Both structures are also exported via an mmap() operation on certain
architectures, and this suffers from incompatibility between 32-bit
and 64-bit user space. As we have to change both structures anyway,
this is a good opportunity to fix the mmap() problem as well, so let's
standardize on the existing 64-bit layout of the structure where possible.
The downside is that we lose mmap() support for existing 32-bit x86 and
powerpc applications, adding that would introduce very noticeable runtime
overhead and complexity. My assumption here is that not too many people
will miss the removed feature, given that:
- Almost all x86 and powerpc users these days are on 64-bit kernels,
the majority of today's 32-bit users are on architectures that never
supported mmap (ARM, MIPS, ...).
- It never worked in compat mode (it was intentionally disabled there)
- The application already needs to work with a fallback to
SNDRV_PCM_IOCTL_SYNC_PTR, which will keep working with both the old
and new structure layout.
Both the ioctl() and mmap() based interfaces are changed at the same
time, as they are based on the same structures. Unlike other interfaces,
we change the uapi header to export both the traditional structure and
a version that is portable between 32-bit and 64-bit user space code
and that corresponds to the existing 64-bit layout. We further check the
__USE_TIME_BITS64 macro that will be defined by future C library versions
whenever we use the new time_t definition, so any existing user space
source code will not see any changes until it gets rebuilt against a new
C library. However, the new structures are all visible in addition to the
old ones, allowing applications to explicitly request the new structures.
In order to detect the difference between the old snd_pcm_mmap_status and
the new __snd_pcm_mmap_status64 structure from the ioctl command number,
we rely on one quirk in the structure definition: snd_pcm_mmap_status
must be aligned to alignof(time_t), which leads the compiler to insert
four bytes of padding in struct snd_pcm_sync_ptr after 'flags' and a
corresponding change in the size of snd_pcm_sync_ptr itself. On x86-32
(and only there), the compiler doesn't use 64-bit alignment in structure,
so I'm adding an explicit pad in the structure that has no effect on the
existing 64-bit architectures but ensures that the layout matches for x86.
The snd_pcm_uframes_t type compatibility requires another hack: we can't
easily make that 64 bit wide, so I leave the type as 'unsigned long',
but add padding before and after it, to ensure that the data is properly
aligned to the respective 64-bit field in the in-kernel structure.
For the SNDRV_PCM_MMAP_OFFSET_STATUS/CONTROL constants that are used
as the virtual file offset in the mmap() function, we also have to
introduce new constants that depend on hte __USE_TIME_BITS64 macro:
The existing macros are renamed to SNDRV_PCM_MMAP_OFFSET_STATUS_OLD
and SNDRV_PCM_MMAP_OFFSET_CONTROL_OLD, they continue to work fine on
64-bit architectures, but stop working on native 32-bit user space.
The replacement _NEW constants are now used by default for user space
built with __USE_TIME_BITS64, those now work on all new kernels for x86,
ppc and alpha (32 and 64 bit, native and compat). It might be a good idea
for a future alsa-lib to support both the _OLD and _NEW macros and use
the corresponding structures directly. Unmodified alsa-lib source code
will retain the current behavior, so it will no longer be able to use
mmap() for the status/control structures on 32-bit systems, until either
the C library gets updated to 64-bit time_t or alsa-lib gets updated to
support both mmap() layouts.
Co-developed-with: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-04-24 15:06:15 +03:00
|
|
|
s64 tstamp_sec;
|
|
|
|
s64 tstamp_nsec;
|
2020-01-31 18:22:14 +03:00
|
|
|
snd_pcm_state_t suspended_state;
|
2017-09-21 09:03:29 +03:00
|
|
|
s32 pad3;
|
ALSA: add new 32-bit layout for snd_pcm_mmap_status/control
The snd_pcm_mmap_status and snd_pcm_mmap_control interfaces are one of the
trickiest areas to get right when moving to 64-bit time_t in user space.
The snd_pcm_mmap_status structure layout is incompatible with user space
that uses a 64-bit time_t, so we need a new layout for it. Since the
SNDRV_PCM_IOCTL_SYNC_PTR ioctl combines it with snd_pcm_mmap_control
into snd_pcm_sync_ptr, we need to change those two as well.
Both structures are also exported via an mmap() operation on certain
architectures, and this suffers from incompatibility between 32-bit
and 64-bit user space. As we have to change both structures anyway,
this is a good opportunity to fix the mmap() problem as well, so let's
standardize on the existing 64-bit layout of the structure where possible.
The downside is that we lose mmap() support for existing 32-bit x86 and
powerpc applications, adding that would introduce very noticeable runtime
overhead and complexity. My assumption here is that not too many people
will miss the removed feature, given that:
- Almost all x86 and powerpc users these days are on 64-bit kernels,
the majority of today's 32-bit users are on architectures that never
supported mmap (ARM, MIPS, ...).
- It never worked in compat mode (it was intentionally disabled there)
- The application already needs to work with a fallback to
SNDRV_PCM_IOCTL_SYNC_PTR, which will keep working with both the old
and new structure layout.
Both the ioctl() and mmap() based interfaces are changed at the same
time, as they are based on the same structures. Unlike other interfaces,
we change the uapi header to export both the traditional structure and
a version that is portable between 32-bit and 64-bit user space code
and that corresponds to the existing 64-bit layout. We further check the
__USE_TIME_BITS64 macro that will be defined by future C library versions
whenever we use the new time_t definition, so any existing user space
source code will not see any changes until it gets rebuilt against a new
C library. However, the new structures are all visible in addition to the
old ones, allowing applications to explicitly request the new structures.
In order to detect the difference between the old snd_pcm_mmap_status and
the new __snd_pcm_mmap_status64 structure from the ioctl command number,
we rely on one quirk in the structure definition: snd_pcm_mmap_status
must be aligned to alignof(time_t), which leads the compiler to insert
four bytes of padding in struct snd_pcm_sync_ptr after 'flags' and a
corresponding change in the size of snd_pcm_sync_ptr itself. On x86-32
(and only there), the compiler doesn't use 64-bit alignment in structure,
so I'm adding an explicit pad in the structure that has no effect on the
existing 64-bit architectures but ensures that the layout matches for x86.
The snd_pcm_uframes_t type compatibility requires another hack: we can't
easily make that 64 bit wide, so I leave the type as 'unsigned long',
but add padding before and after it, to ensure that the data is properly
aligned to the respective 64-bit field in the in-kernel structure.
For the SNDRV_PCM_MMAP_OFFSET_STATUS/CONTROL constants that are used
as the virtual file offset in the mmap() function, we also have to
introduce new constants that depend on hte __USE_TIME_BITS64 macro:
The existing macros are renamed to SNDRV_PCM_MMAP_OFFSET_STATUS_OLD
and SNDRV_PCM_MMAP_OFFSET_CONTROL_OLD, they continue to work fine on
64-bit architectures, but stop working on native 32-bit user space.
The replacement _NEW constants are now used by default for user space
built with __USE_TIME_BITS64, those now work on all new kernels for x86,
ppc and alpha (32 and 64 bit, native and compat). It might be a good idea
for a future alsa-lib to support both the _OLD and _NEW macros and use
the corresponding structures directly. Unmodified alsa-lib source code
will retain the current behavior, so it will no longer be able to use
mmap() for the status/control structures on 32-bit systems, until either
the C library gets updated to 64-bit time_t or alsa-lib gets updated to
support both mmap() layouts.
Co-developed-with: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-04-24 15:06:15 +03:00
|
|
|
s64 audio_tstamp_sec;
|
|
|
|
s64 audio_tstamp_nsec;
|
2016-02-28 13:23:09 +03:00
|
|
|
} __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);
|
ALSA: memalloc: Support for non-contiguous page allocation
This patch adds the support for allocation of non-contiguous DMA pages
in the common memalloc helper. It's another SG-buffer type, but
unlike the existing one, this is directional and requires the explicit
sync / invalidation of dirty pages on non-coherent architectures.
For this enhancement, the following points are changed:
- snd_dma_device stores the DMA direction.
- snd_dma_device stores need_sync flag indicating whether the explicit
sync is required or not.
- A new variant of helper functions, snd_dma_alloc_dir_pages() and
*_all() are introduced; the old snd_dma_alloc_pages() and *_all()
kept as just wrappers with DMA_BIDIRECTIONAL.
- A new helper snd_dma_buffer_sync() is introduced; this gets called
in the appropriate places.
- A new allocation type, SNDRV_DMA_TYPE_NONCONTIG, is introduced.
When the driver allocates pages with this new type, and it may require
the SNDRV_PCM_INFO_EXPLICIT_SYNC flag set to the PCM hardware.info for
taking the full control of PCM applptr and hwptr changes (that implies
disabling the mmap of control/status data). When the buffer
allocation is managed by snd_pcm_set_managed_buffer(), this flag is
automatically set depending on the result of dma_need_sync()
internally. Otherwise, if the buffer is managed manually, the driver
has to set the flag explicitly, too.
The explicit sync between CPU and device for non-coherent memory is
performed at the points before and after read/write transfer as well
as the applptr/hwptr syncptr ioctl. In the case of mmap mode,
user-space is supposed to call the syncptr ioctl with the hwptr flag
to update and fetch the status at first; this corresponds to CPU-sync.
Then user-space advances the applptr via syncptr ioctl again with
applptr flag, and this corresponds to the device sync with flushing.
Other than the DMA direction and the explicit sync, the usage of this
new buffer type is almost equivalent with the existing
SNDRV_DMA_TYPE_DEV_SG; you can get the page and the address via
snd_sgbuf_get_page() and snd_sgbuf_get_addr(), also calculate the
continuous pages via snd_sgbuf_get_chunk_size().
For those SG-page handling, the non-contig type shares the same ops
with the vmalloc handler. As we do always vmap the SG pages at first,
the actual address can be deduced from the vmapped address easily
without iterating the SG-list.
Link: https://lore.kernel.org/r/20211017074859.24112-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2021-10-17 10:48:57 +03:00
|
|
|
if (!(sflags & SNDRV_PCM_SYNC_PTR_APPL))
|
|
|
|
snd_pcm_dma_buffer_sync(substream, SNDRV_DMA_SYNC_DEVICE);
|
2016-02-28 13:23:09 +03:00
|
|
|
if (put_user(sstatus.state, &src->s.status.state) ||
|
|
|
|
put_user(sstatus.hw_ptr, &src->s.status.hw_ptr) ||
|
ALSA: add new 32-bit layout for snd_pcm_mmap_status/control
The snd_pcm_mmap_status and snd_pcm_mmap_control interfaces are one of the
trickiest areas to get right when moving to 64-bit time_t in user space.
The snd_pcm_mmap_status structure layout is incompatible with user space
that uses a 64-bit time_t, so we need a new layout for it. Since the
SNDRV_PCM_IOCTL_SYNC_PTR ioctl combines it with snd_pcm_mmap_control
into snd_pcm_sync_ptr, we need to change those two as well.
Both structures are also exported via an mmap() operation on certain
architectures, and this suffers from incompatibility between 32-bit
and 64-bit user space. As we have to change both structures anyway,
this is a good opportunity to fix the mmap() problem as well, so let's
standardize on the existing 64-bit layout of the structure where possible.
The downside is that we lose mmap() support for existing 32-bit x86 and
powerpc applications, adding that would introduce very noticeable runtime
overhead and complexity. My assumption here is that not too many people
will miss the removed feature, given that:
- Almost all x86 and powerpc users these days are on 64-bit kernels,
the majority of today's 32-bit users are on architectures that never
supported mmap (ARM, MIPS, ...).
- It never worked in compat mode (it was intentionally disabled there)
- The application already needs to work with a fallback to
SNDRV_PCM_IOCTL_SYNC_PTR, which will keep working with both the old
and new structure layout.
Both the ioctl() and mmap() based interfaces are changed at the same
time, as they are based on the same structures. Unlike other interfaces,
we change the uapi header to export both the traditional structure and
a version that is portable between 32-bit and 64-bit user space code
and that corresponds to the existing 64-bit layout. We further check the
__USE_TIME_BITS64 macro that will be defined by future C library versions
whenever we use the new time_t definition, so any existing user space
source code will not see any changes until it gets rebuilt against a new
C library. However, the new structures are all visible in addition to the
old ones, allowing applications to explicitly request the new structures.
In order to detect the difference between the old snd_pcm_mmap_status and
the new __snd_pcm_mmap_status64 structure from the ioctl command number,
we rely on one quirk in the structure definition: snd_pcm_mmap_status
must be aligned to alignof(time_t), which leads the compiler to insert
four bytes of padding in struct snd_pcm_sync_ptr after 'flags' and a
corresponding change in the size of snd_pcm_sync_ptr itself. On x86-32
(and only there), the compiler doesn't use 64-bit alignment in structure,
so I'm adding an explicit pad in the structure that has no effect on the
existing 64-bit architectures but ensures that the layout matches for x86.
The snd_pcm_uframes_t type compatibility requires another hack: we can't
easily make that 64 bit wide, so I leave the type as 'unsigned long',
but add padding before and after it, to ensure that the data is properly
aligned to the respective 64-bit field in the in-kernel structure.
For the SNDRV_PCM_MMAP_OFFSET_STATUS/CONTROL constants that are used
as the virtual file offset in the mmap() function, we also have to
introduce new constants that depend on hte __USE_TIME_BITS64 macro:
The existing macros are renamed to SNDRV_PCM_MMAP_OFFSET_STATUS_OLD
and SNDRV_PCM_MMAP_OFFSET_CONTROL_OLD, they continue to work fine on
64-bit architectures, but stop working on native 32-bit user space.
The replacement _NEW constants are now used by default for user space
built with __USE_TIME_BITS64, those now work on all new kernels for x86,
ppc and alpha (32 and 64 bit, native and compat). It might be a good idea
for a future alsa-lib to support both the _OLD and _NEW macros and use
the corresponding structures directly. Unmodified alsa-lib source code
will retain the current behavior, so it will no longer be able to use
mmap() for the status/control structures on 32-bit systems, until either
the C library gets updated to 64-bit time_t or alsa-lib gets updated to
support both mmap() layouts.
Co-developed-with: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-04-24 15:06:15 +03:00
|
|
|
put_user(sstatus.tstamp.tv_sec, &src->s.status.tstamp_sec) ||
|
|
|
|
put_user(sstatus.tstamp.tv_nsec, &src->s.status.tstamp_nsec) ||
|
2016-02-28 13:23:09 +03:00
|
|
|
put_user(sstatus.suspended_state, &src->s.status.suspended_state) ||
|
ALSA: add new 32-bit layout for snd_pcm_mmap_status/control
The snd_pcm_mmap_status and snd_pcm_mmap_control interfaces are one of the
trickiest areas to get right when moving to 64-bit time_t in user space.
The snd_pcm_mmap_status structure layout is incompatible with user space
that uses a 64-bit time_t, so we need a new layout for it. Since the
SNDRV_PCM_IOCTL_SYNC_PTR ioctl combines it with snd_pcm_mmap_control
into snd_pcm_sync_ptr, we need to change those two as well.
Both structures are also exported via an mmap() operation on certain
architectures, and this suffers from incompatibility between 32-bit
and 64-bit user space. As we have to change both structures anyway,
this is a good opportunity to fix the mmap() problem as well, so let's
standardize on the existing 64-bit layout of the structure where possible.
The downside is that we lose mmap() support for existing 32-bit x86 and
powerpc applications, adding that would introduce very noticeable runtime
overhead and complexity. My assumption here is that not too many people
will miss the removed feature, given that:
- Almost all x86 and powerpc users these days are on 64-bit kernels,
the majority of today's 32-bit users are on architectures that never
supported mmap (ARM, MIPS, ...).
- It never worked in compat mode (it was intentionally disabled there)
- The application already needs to work with a fallback to
SNDRV_PCM_IOCTL_SYNC_PTR, which will keep working with both the old
and new structure layout.
Both the ioctl() and mmap() based interfaces are changed at the same
time, as they are based on the same structures. Unlike other interfaces,
we change the uapi header to export both the traditional structure and
a version that is portable between 32-bit and 64-bit user space code
and that corresponds to the existing 64-bit layout. We further check the
__USE_TIME_BITS64 macro that will be defined by future C library versions
whenever we use the new time_t definition, so any existing user space
source code will not see any changes until it gets rebuilt against a new
C library. However, the new structures are all visible in addition to the
old ones, allowing applications to explicitly request the new structures.
In order to detect the difference between the old snd_pcm_mmap_status and
the new __snd_pcm_mmap_status64 structure from the ioctl command number,
we rely on one quirk in the structure definition: snd_pcm_mmap_status
must be aligned to alignof(time_t), which leads the compiler to insert
four bytes of padding in struct snd_pcm_sync_ptr after 'flags' and a
corresponding change in the size of snd_pcm_sync_ptr itself. On x86-32
(and only there), the compiler doesn't use 64-bit alignment in structure,
so I'm adding an explicit pad in the structure that has no effect on the
existing 64-bit architectures but ensures that the layout matches for x86.
The snd_pcm_uframes_t type compatibility requires another hack: we can't
easily make that 64 bit wide, so I leave the type as 'unsigned long',
but add padding before and after it, to ensure that the data is properly
aligned to the respective 64-bit field in the in-kernel structure.
For the SNDRV_PCM_MMAP_OFFSET_STATUS/CONTROL constants that are used
as the virtual file offset in the mmap() function, we also have to
introduce new constants that depend on hte __USE_TIME_BITS64 macro:
The existing macros are renamed to SNDRV_PCM_MMAP_OFFSET_STATUS_OLD
and SNDRV_PCM_MMAP_OFFSET_CONTROL_OLD, they continue to work fine on
64-bit architectures, but stop working on native 32-bit user space.
The replacement _NEW constants are now used by default for user space
built with __USE_TIME_BITS64, those now work on all new kernels for x86,
ppc and alpha (32 and 64 bit, native and compat). It might be a good idea
for a future alsa-lib to support both the _OLD and _NEW macros and use
the corresponding structures directly. Unmodified alsa-lib source code
will retain the current behavior, so it will no longer be able to use
mmap() for the status/control structures on 32-bit systems, until either
the C library gets updated to 64-bit time_t or alsa-lib gets updated to
support both mmap() layouts.
Co-developed-with: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-04-24 15:06:15 +03:00
|
|
|
put_user(sstatus.audio_tstamp.tv_sec, &src->s.status.audio_tstamp_sec) ||
|
|
|
|
put_user(sstatus.audio_tstamp.tv_nsec, &src->s.status.audio_tstamp_nsec) ||
|
2016-02-28 13:23:09 +03: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;
|
|
|
|
}
|
2022-03-14 22:48:41 +03:00
|
|
|
#endif /* CONFIG_X86_X32_ABI */
|
2005-04-17 02:20:36 +04:00
|
|
|
|
ALSA: pcm: Workaround for a wrong offset in SYNC_PTR compat ioctl
Michael Forney reported an incorrect padding type that was defined in
the commit 80fe7430c708 ("ALSA: add new 32-bit layout for
snd_pcm_mmap_status/control") for PCM control mmap data.
His analysis is correct, and this caused the misplacements of PCM
control data on 32bit arch and 32bit compat mode.
The bug is that the __pad2 definition in __snd_pcm_mmap_control64
struct was wrongly with __pad_before_uframe, which should have been
__pad_after_uframe instead. This struct is used in SYNC_PTR ioctl and
control mmap. Basically this bug leads to two problems:
- The offset of avail_min field becomes wrong, it's placed right after
appl_ptr without padding on little-endian
- When appl_ptr and avail_min are read as 64bit values in kernel side,
the values become either zero or corrupted (mixed up)
One good news is that, because both user-space and kernel
misunderstand the wrong offset, at least, 32bit application running on
32bit kernel works as is. Also, 64bit applications are unaffected
because the padding size is zero. The remaining problem is the 32bit
compat mode; as mentioned in the above, avail_min is placed right
after appl_ptr on little-endian archs, 64bit kernel reads bogus values
for appl_ptr updates, which may lead to streaming bugs like jumping,
XRUN or whatever unexpected.
(However, we haven't heard any serious bug reports due to this over
years, so practically seen, it's fairly safe to assume that the impact
by this bug is limited.)
Ideally speaking, we should correct the wrong mmap status control
definition. But this would cause again incompatibility with the
existing binaries, and fixing it (e.g. by renumbering ioctls) would be
really messy.
So, as of this patch, we only correct the behavior of 32bit compat
mode and keep the rest as is. Namely, the SYNC_PTR ioctl is now
handled differently in compat mode to read/write the 32bit values at
the right offsets. The control mmap of 32bit apps on 64bit kernels
has been already disabled (which is likely rather an overlook, but
this worked fine at this time :), so covering SYNC_PTR ioctl should
suffice as a fallback.
Fixes: 80fe7430c708 ("ALSA: add new 32-bit layout for snd_pcm_mmap_status/control")
Reported-by: Michael Forney <mforney@mforney.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Cc: <stable@vger.kernel.org>
Cc: Rich Felker <dalias@libc.org>
Link: https://lore.kernel.org/r/29QBMJU8DE71E.2YZSH8IHT5HMH@mforney.org
Link: https://lore.kernel.org/r/20211010075546.23220-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2021-10-10 10:55:46 +03:00
|
|
|
#ifdef __BIG_ENDIAN
|
|
|
|
typedef char __pad_before_u32[4];
|
|
|
|
typedef char __pad_after_u32[0];
|
|
|
|
#else
|
|
|
|
typedef char __pad_before_u32[0];
|
|
|
|
typedef char __pad_after_u32[4];
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* PCM 2.0.15 API definition had a bug in mmap control; it puts the avail_min
|
|
|
|
* at the wrong offset due to a typo in padding type.
|
|
|
|
* The bug hits only 32bit.
|
|
|
|
* A workaround for incorrect read/write is needed only in 32bit compat mode.
|
|
|
|
*/
|
|
|
|
struct __snd_pcm_mmap_control64_buggy {
|
|
|
|
__pad_before_u32 __pad1;
|
|
|
|
__u32 appl_ptr;
|
|
|
|
__pad_before_u32 __pad2; /* SiC! here is the bug */
|
|
|
|
__pad_before_u32 __pad3;
|
|
|
|
__u32 avail_min;
|
|
|
|
__pad_after_uframe __pad4;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int snd_pcm_ioctl_sync_ptr_buggy(struct snd_pcm_substream *substream,
|
|
|
|
struct snd_pcm_sync_ptr __user *_sync_ptr)
|
|
|
|
{
|
|
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
|
|
struct snd_pcm_sync_ptr sync_ptr;
|
|
|
|
struct __snd_pcm_mmap_control64_buggy *sync_cp;
|
|
|
|
volatile struct snd_pcm_mmap_status *status;
|
|
|
|
volatile struct snd_pcm_mmap_control *control;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
memset(&sync_ptr, 0, sizeof(sync_ptr));
|
|
|
|
sync_cp = (struct __snd_pcm_mmap_control64_buggy *)&sync_ptr.c.control;
|
|
|
|
if (get_user(sync_ptr.flags, (unsigned __user *)&(_sync_ptr->flags)))
|
|
|
|
return -EFAULT;
|
|
|
|
if (copy_from_user(sync_cp, &(_sync_ptr->c.control), sizeof(*sync_cp)))
|
|
|
|
return -EFAULT;
|
|
|
|
status = runtime->status;
|
|
|
|
control = runtime->control;
|
|
|
|
if (sync_ptr.flags & SNDRV_PCM_SYNC_PTR_HWSYNC) {
|
|
|
|
err = snd_pcm_hwsync(substream);
|
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
snd_pcm_stream_lock_irq(substream);
|
|
|
|
if (!(sync_ptr.flags & SNDRV_PCM_SYNC_PTR_APPL)) {
|
|
|
|
err = pcm_lib_apply_appl_ptr(substream, sync_cp->appl_ptr);
|
|
|
|
if (err < 0) {
|
|
|
|
snd_pcm_stream_unlock_irq(substream);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
sync_cp->appl_ptr = control->appl_ptr;
|
|
|
|
}
|
|
|
|
if (!(sync_ptr.flags & SNDRV_PCM_SYNC_PTR_AVAIL_MIN))
|
|
|
|
control->avail_min = sync_cp->avail_min;
|
|
|
|
else
|
|
|
|
sync_cp->avail_min = control->avail_min;
|
|
|
|
sync_ptr.s.status.state = status->state;
|
|
|
|
sync_ptr.s.status.hw_ptr = status->hw_ptr;
|
|
|
|
sync_ptr.s.status.tstamp = status->tstamp;
|
|
|
|
sync_ptr.s.status.suspended_state = status->suspended_state;
|
|
|
|
sync_ptr.s.status.audio_tstamp = status->audio_tstamp;
|
|
|
|
snd_pcm_stream_unlock_irq(substream);
|
ALSA: memalloc: Support for non-contiguous page allocation
This patch adds the support for allocation of non-contiguous DMA pages
in the common memalloc helper. It's another SG-buffer type, but
unlike the existing one, this is directional and requires the explicit
sync / invalidation of dirty pages on non-coherent architectures.
For this enhancement, the following points are changed:
- snd_dma_device stores the DMA direction.
- snd_dma_device stores need_sync flag indicating whether the explicit
sync is required or not.
- A new variant of helper functions, snd_dma_alloc_dir_pages() and
*_all() are introduced; the old snd_dma_alloc_pages() and *_all()
kept as just wrappers with DMA_BIDIRECTIONAL.
- A new helper snd_dma_buffer_sync() is introduced; this gets called
in the appropriate places.
- A new allocation type, SNDRV_DMA_TYPE_NONCONTIG, is introduced.
When the driver allocates pages with this new type, and it may require
the SNDRV_PCM_INFO_EXPLICIT_SYNC flag set to the PCM hardware.info for
taking the full control of PCM applptr and hwptr changes (that implies
disabling the mmap of control/status data). When the buffer
allocation is managed by snd_pcm_set_managed_buffer(), this flag is
automatically set depending on the result of dma_need_sync()
internally. Otherwise, if the buffer is managed manually, the driver
has to set the flag explicitly, too.
The explicit sync between CPU and device for non-coherent memory is
performed at the points before and after read/write transfer as well
as the applptr/hwptr syncptr ioctl. In the case of mmap mode,
user-space is supposed to call the syncptr ioctl with the hwptr flag
to update and fetch the status at first; this corresponds to CPU-sync.
Then user-space advances the applptr via syncptr ioctl again with
applptr flag, and this corresponds to the device sync with flushing.
Other than the DMA direction and the explicit sync, the usage of this
new buffer type is almost equivalent with the existing
SNDRV_DMA_TYPE_DEV_SG; you can get the page and the address via
snd_sgbuf_get_page() and snd_sgbuf_get_addr(), also calculate the
continuous pages via snd_sgbuf_get_chunk_size().
For those SG-page handling, the non-contig type shares the same ops
with the vmalloc handler. As we do always vmap the SG pages at first,
the actual address can be deduced from the vmapped address easily
without iterating the SG-list.
Link: https://lore.kernel.org/r/20211017074859.24112-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2021-10-17 10:48:57 +03:00
|
|
|
if (!(sync_ptr.flags & SNDRV_PCM_SYNC_PTR_APPL))
|
|
|
|
snd_pcm_dma_buffer_sync(substream, SNDRV_DMA_SYNC_DEVICE);
|
ALSA: pcm: Workaround for a wrong offset in SYNC_PTR compat ioctl
Michael Forney reported an incorrect padding type that was defined in
the commit 80fe7430c708 ("ALSA: add new 32-bit layout for
snd_pcm_mmap_status/control") for PCM control mmap data.
His analysis is correct, and this caused the misplacements of PCM
control data on 32bit arch and 32bit compat mode.
The bug is that the __pad2 definition in __snd_pcm_mmap_control64
struct was wrongly with __pad_before_uframe, which should have been
__pad_after_uframe instead. This struct is used in SYNC_PTR ioctl and
control mmap. Basically this bug leads to two problems:
- The offset of avail_min field becomes wrong, it's placed right after
appl_ptr without padding on little-endian
- When appl_ptr and avail_min are read as 64bit values in kernel side,
the values become either zero or corrupted (mixed up)
One good news is that, because both user-space and kernel
misunderstand the wrong offset, at least, 32bit application running on
32bit kernel works as is. Also, 64bit applications are unaffected
because the padding size is zero. The remaining problem is the 32bit
compat mode; as mentioned in the above, avail_min is placed right
after appl_ptr on little-endian archs, 64bit kernel reads bogus values
for appl_ptr updates, which may lead to streaming bugs like jumping,
XRUN or whatever unexpected.
(However, we haven't heard any serious bug reports due to this over
years, so practically seen, it's fairly safe to assume that the impact
by this bug is limited.)
Ideally speaking, we should correct the wrong mmap status control
definition. But this would cause again incompatibility with the
existing binaries, and fixing it (e.g. by renumbering ioctls) would be
really messy.
So, as of this patch, we only correct the behavior of 32bit compat
mode and keep the rest as is. Namely, the SYNC_PTR ioctl is now
handled differently in compat mode to read/write the 32bit values at
the right offsets. The control mmap of 32bit apps on 64bit kernels
has been already disabled (which is likely rather an overlook, but
this worked fine at this time :), so covering SYNC_PTR ioctl should
suffice as a fallback.
Fixes: 80fe7430c708 ("ALSA: add new 32-bit layout for snd_pcm_mmap_status/control")
Reported-by: Michael Forney <mforney@mforney.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Cc: <stable@vger.kernel.org>
Cc: Rich Felker <dalias@libc.org>
Link: https://lore.kernel.org/r/29QBMJU8DE71E.2YZSH8IHT5HMH@mforney.org
Link: https://lore.kernel.org/r/20211010075546.23220-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2021-10-10 10:55:46 +03:00
|
|
|
if (copy_to_user(_sync_ptr, &sync_ptr, sizeof(sync_ptr)))
|
|
|
|
return -EFAULT;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
*/
|
|
|
|
enum {
|
2005-11-17 15:59:38 +03: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),
|
2018-04-24 15:06:11 +03:00
|
|
|
SNDRV_PCM_IOCTL_STATUS_COMPAT32 = _IOR('A', 0x20, struct snd_pcm_status32),
|
|
|
|
SNDRV_PCM_IOCTL_STATUS_EXT_COMPAT32 = _IOWR('A', 0x24, struct snd_pcm_status32),
|
2005-04-17 02:20:36 +04:00
|
|
|
SNDRV_PCM_IOCTL_DELAY32 = _IOR('A', 0x21, s32),
|
2005-11-17 15:59:38 +03:00
|
|
|
SNDRV_PCM_IOCTL_CHANNEL_INFO32 = _IOR('A', 0x32, struct snd_pcm_channel_info32),
|
2005-04-17 02:20:36 +04:00
|
|
|
SNDRV_PCM_IOCTL_REWIND32 = _IOW('A', 0x46, u32),
|
|
|
|
SNDRV_PCM_IOCTL_FORWARD32 = _IOW('A', 0x49, u32),
|
2005-11-17 15:59:38 +03: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),
|
2018-04-24 15:06:11 +03:00
|
|
|
SNDRV_PCM_IOCTL_STATUS_COMPAT64 = _IOR('A', 0x20, struct compat_snd_pcm_status64),
|
|
|
|
SNDRV_PCM_IOCTL_STATUS_EXT_COMPAT64 = _IOWR('A', 0x24, struct compat_snd_pcm_status64),
|
2022-03-14 22:48:41 +03:00
|
|
|
#ifdef CONFIG_X86_X32_ABI
|
2016-02-28 13:23:09 +03:00
|
|
|
SNDRV_PCM_IOCTL_CHANNEL_INFO_X32 = _IOR('A', 0x32, struct snd_pcm_channel_info),
|
|
|
|
SNDRV_PCM_IOCTL_SYNC_PTR_X32 = _IOWR('A', 0x23, struct snd_pcm_sync_ptr_x32),
|
2022-03-14 22:48:41 +03:00
|
|
|
#endif /* CONFIG_X86_X32_ABI */
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
static long snd_pcm_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg)
|
|
|
|
{
|
2005-11-17 15:59:38 +03:00
|
|
|
struct snd_pcm_file *pcm_file;
|
|
|
|
struct snd_pcm_substream *substream;
|
2005-04-17 02:20:36 +04: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
|
ALSA: add new 32-bit layout for snd_pcm_mmap_status/control
The snd_pcm_mmap_status and snd_pcm_mmap_control interfaces are one of the
trickiest areas to get right when moving to 64-bit time_t in user space.
The snd_pcm_mmap_status structure layout is incompatible with user space
that uses a 64-bit time_t, so we need a new layout for it. Since the
SNDRV_PCM_IOCTL_SYNC_PTR ioctl combines it with snd_pcm_mmap_control
into snd_pcm_sync_ptr, we need to change those two as well.
Both structures are also exported via an mmap() operation on certain
architectures, and this suffers from incompatibility between 32-bit
and 64-bit user space. As we have to change both structures anyway,
this is a good opportunity to fix the mmap() problem as well, so let's
standardize on the existing 64-bit layout of the structure where possible.
The downside is that we lose mmap() support for existing 32-bit x86 and
powerpc applications, adding that would introduce very noticeable runtime
overhead and complexity. My assumption here is that not too many people
will miss the removed feature, given that:
- Almost all x86 and powerpc users these days are on 64-bit kernels,
the majority of today's 32-bit users are on architectures that never
supported mmap (ARM, MIPS, ...).
- It never worked in compat mode (it was intentionally disabled there)
- The application already needs to work with a fallback to
SNDRV_PCM_IOCTL_SYNC_PTR, which will keep working with both the old
and new structure layout.
Both the ioctl() and mmap() based interfaces are changed at the same
time, as they are based on the same structures. Unlike other interfaces,
we change the uapi header to export both the traditional structure and
a version that is portable between 32-bit and 64-bit user space code
and that corresponds to the existing 64-bit layout. We further check the
__USE_TIME_BITS64 macro that will be defined by future C library versions
whenever we use the new time_t definition, so any existing user space
source code will not see any changes until it gets rebuilt against a new
C library. However, the new structures are all visible in addition to the
old ones, allowing applications to explicitly request the new structures.
In order to detect the difference between the old snd_pcm_mmap_status and
the new __snd_pcm_mmap_status64 structure from the ioctl command number,
we rely on one quirk in the structure definition: snd_pcm_mmap_status
must be aligned to alignof(time_t), which leads the compiler to insert
four bytes of padding in struct snd_pcm_sync_ptr after 'flags' and a
corresponding change in the size of snd_pcm_sync_ptr itself. On x86-32
(and only there), the compiler doesn't use 64-bit alignment in structure,
so I'm adding an explicit pad in the structure that has no effect on the
existing 64-bit architectures but ensures that the layout matches for x86.
The snd_pcm_uframes_t type compatibility requires another hack: we can't
easily make that 64 bit wide, so I leave the type as 'unsigned long',
but add padding before and after it, to ensure that the data is properly
aligned to the respective 64-bit field in the in-kernel structure.
For the SNDRV_PCM_MMAP_OFFSET_STATUS/CONTROL constants that are used
as the virtual file offset in the mmap() function, we also have to
introduce new constants that depend on hte __USE_TIME_BITS64 macro:
The existing macros are renamed to SNDRV_PCM_MMAP_OFFSET_STATUS_OLD
and SNDRV_PCM_MMAP_OFFSET_CONTROL_OLD, they continue to work fine on
64-bit architectures, but stop working on native 32-bit user space.
The replacement _NEW constants are now used by default for user space
built with __USE_TIME_BITS64, those now work on all new kernels for x86,
ppc and alpha (32 and 64 bit, native and compat). It might be a good idea
for a future alsa-lib to support both the _OLD and _NEW macros and use
the corresponding structures directly. Unmodified alsa-lib source code
will retain the current behavior, so it will no longer be able to use
mmap() for the status/control structures on 32-bit systems, until either
the C library gets updated to 64-bit time_t or alsa-lib gets updated to
support both mmap() layouts.
Co-developed-with: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-04-24 15:06:15 +03:00
|
|
|
* mmap of the old PCM status/control records because
|
|
|
|
* of the size incompatibility.
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
2006-07-31 18:51:51 +04:00
|
|
|
pcm_file->no_compat_mmap = 1;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
case SNDRV_PCM_IOCTL_PVERSION:
|
|
|
|
case SNDRV_PCM_IOCTL_INFO:
|
2007-12-17 13:44:25 +03:00
|
|
|
case SNDRV_PCM_IOCTL_TSTAMP:
|
2007-12-14 14:10:26 +03: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-20 00:11:54 +03:00
|
|
|
case SNDRV_PCM_IOCTL_USER_PVERSION:
|
2005-04-17 02:20:36 +04: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:
|
ALSA: add new 32-bit layout for snd_pcm_mmap_status/control
The snd_pcm_mmap_status and snd_pcm_mmap_control interfaces are one of the
trickiest areas to get right when moving to 64-bit time_t in user space.
The snd_pcm_mmap_status structure layout is incompatible with user space
that uses a 64-bit time_t, so we need a new layout for it. Since the
SNDRV_PCM_IOCTL_SYNC_PTR ioctl combines it with snd_pcm_mmap_control
into snd_pcm_sync_ptr, we need to change those two as well.
Both structures are also exported via an mmap() operation on certain
architectures, and this suffers from incompatibility between 32-bit
and 64-bit user space. As we have to change both structures anyway,
this is a good opportunity to fix the mmap() problem as well, so let's
standardize on the existing 64-bit layout of the structure where possible.
The downside is that we lose mmap() support for existing 32-bit x86 and
powerpc applications, adding that would introduce very noticeable runtime
overhead and complexity. My assumption here is that not too many people
will miss the removed feature, given that:
- Almost all x86 and powerpc users these days are on 64-bit kernels,
the majority of today's 32-bit users are on architectures that never
supported mmap (ARM, MIPS, ...).
- It never worked in compat mode (it was intentionally disabled there)
- The application already needs to work with a fallback to
SNDRV_PCM_IOCTL_SYNC_PTR, which will keep working with both the old
and new structure layout.
Both the ioctl() and mmap() based interfaces are changed at the same
time, as they are based on the same structures. Unlike other interfaces,
we change the uapi header to export both the traditional structure and
a version that is portable between 32-bit and 64-bit user space code
and that corresponds to the existing 64-bit layout. We further check the
__USE_TIME_BITS64 macro that will be defined by future C library versions
whenever we use the new time_t definition, so any existing user space
source code will not see any changes until it gets rebuilt against a new
C library. However, the new structures are all visible in addition to the
old ones, allowing applications to explicitly request the new structures.
In order to detect the difference between the old snd_pcm_mmap_status and
the new __snd_pcm_mmap_status64 structure from the ioctl command number,
we rely on one quirk in the structure definition: snd_pcm_mmap_status
must be aligned to alignof(time_t), which leads the compiler to insert
four bytes of padding in struct snd_pcm_sync_ptr after 'flags' and a
corresponding change in the size of snd_pcm_sync_ptr itself. On x86-32
(and only there), the compiler doesn't use 64-bit alignment in structure,
so I'm adding an explicit pad in the structure that has no effect on the
existing 64-bit architectures but ensures that the layout matches for x86.
The snd_pcm_uframes_t type compatibility requires another hack: we can't
easily make that 64 bit wide, so I leave the type as 'unsigned long',
but add padding before and after it, to ensure that the data is properly
aligned to the respective 64-bit field in the in-kernel structure.
For the SNDRV_PCM_MMAP_OFFSET_STATUS/CONTROL constants that are used
as the virtual file offset in the mmap() function, we also have to
introduce new constants that depend on hte __USE_TIME_BITS64 macro:
The existing macros are renamed to SNDRV_PCM_MMAP_OFFSET_STATUS_OLD
and SNDRV_PCM_MMAP_OFFSET_CONTROL_OLD, they continue to work fine on
64-bit architectures, but stop working on native 32-bit user space.
The replacement _NEW constants are now used by default for user space
built with __USE_TIME_BITS64, those now work on all new kernels for x86,
ppc and alpha (32 and 64 bit, native and compat). It might be a good idea
for a future alsa-lib to support both the _OLD and _NEW macros and use
the corresponding structures directly. Unmodified alsa-lib source code
will retain the current behavior, so it will no longer be able to use
mmap() for the status/control structures on 32-bit systems, until either
the C library gets updated to 64-bit time_t or alsa-lib gets updated to
support both mmap() layouts.
Co-developed-with: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-04-24 15:06:15 +03:00
|
|
|
case __SNDRV_PCM_IOCTL_SYNC_PTR32:
|
|
|
|
return snd_pcm_common_ioctl(file, substream, cmd, argp);
|
|
|
|
case __SNDRV_PCM_IOCTL_SYNC_PTR64:
|
2022-03-14 22:48:41 +03:00
|
|
|
#ifdef CONFIG_X86_X32_ABI
|
ALSA: add new 32-bit layout for snd_pcm_mmap_status/control
The snd_pcm_mmap_status and snd_pcm_mmap_control interfaces are one of the
trickiest areas to get right when moving to 64-bit time_t in user space.
The snd_pcm_mmap_status structure layout is incompatible with user space
that uses a 64-bit time_t, so we need a new layout for it. Since the
SNDRV_PCM_IOCTL_SYNC_PTR ioctl combines it with snd_pcm_mmap_control
into snd_pcm_sync_ptr, we need to change those two as well.
Both structures are also exported via an mmap() operation on certain
architectures, and this suffers from incompatibility between 32-bit
and 64-bit user space. As we have to change both structures anyway,
this is a good opportunity to fix the mmap() problem as well, so let's
standardize on the existing 64-bit layout of the structure where possible.
The downside is that we lose mmap() support for existing 32-bit x86 and
powerpc applications, adding that would introduce very noticeable runtime
overhead and complexity. My assumption here is that not too many people
will miss the removed feature, given that:
- Almost all x86 and powerpc users these days are on 64-bit kernels,
the majority of today's 32-bit users are on architectures that never
supported mmap (ARM, MIPS, ...).
- It never worked in compat mode (it was intentionally disabled there)
- The application already needs to work with a fallback to
SNDRV_PCM_IOCTL_SYNC_PTR, which will keep working with both the old
and new structure layout.
Both the ioctl() and mmap() based interfaces are changed at the same
time, as they are based on the same structures. Unlike other interfaces,
we change the uapi header to export both the traditional structure and
a version that is portable between 32-bit and 64-bit user space code
and that corresponds to the existing 64-bit layout. We further check the
__USE_TIME_BITS64 macro that will be defined by future C library versions
whenever we use the new time_t definition, so any existing user space
source code will not see any changes until it gets rebuilt against a new
C library. However, the new structures are all visible in addition to the
old ones, allowing applications to explicitly request the new structures.
In order to detect the difference between the old snd_pcm_mmap_status and
the new __snd_pcm_mmap_status64 structure from the ioctl command number,
we rely on one quirk in the structure definition: snd_pcm_mmap_status
must be aligned to alignof(time_t), which leads the compiler to insert
four bytes of padding in struct snd_pcm_sync_ptr after 'flags' and a
corresponding change in the size of snd_pcm_sync_ptr itself. On x86-32
(and only there), the compiler doesn't use 64-bit alignment in structure,
so I'm adding an explicit pad in the structure that has no effect on the
existing 64-bit architectures but ensures that the layout matches for x86.
The snd_pcm_uframes_t type compatibility requires another hack: we can't
easily make that 64 bit wide, so I leave the type as 'unsigned long',
but add padding before and after it, to ensure that the data is properly
aligned to the respective 64-bit field in the in-kernel structure.
For the SNDRV_PCM_MMAP_OFFSET_STATUS/CONTROL constants that are used
as the virtual file offset in the mmap() function, we also have to
introduce new constants that depend on hte __USE_TIME_BITS64 macro:
The existing macros are renamed to SNDRV_PCM_MMAP_OFFSET_STATUS_OLD
and SNDRV_PCM_MMAP_OFFSET_CONTROL_OLD, they continue to work fine on
64-bit architectures, but stop working on native 32-bit user space.
The replacement _NEW constants are now used by default for user space
built with __USE_TIME_BITS64, those now work on all new kernels for x86,
ppc and alpha (32 and 64 bit, native and compat). It might be a good idea
for a future alsa-lib to support both the _OLD and _NEW macros and use
the corresponding structures directly. Unmodified alsa-lib source code
will retain the current behavior, so it will no longer be able to use
mmap() for the status/control structures on 32-bit systems, until either
the C library gets updated to 64-bit time_t or alsa-lib gets updated to
support both mmap() layouts.
Co-developed-with: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-04-24 15:06:15 +03:00
|
|
|
if (in_x32_syscall())
|
|
|
|
return snd_pcm_ioctl_sync_ptr_x32(substream, argp);
|
2022-03-14 22:48:41 +03:00
|
|
|
#endif /* CONFIG_X86_X32_ABI */
|
ALSA: pcm: Workaround for a wrong offset in SYNC_PTR compat ioctl
Michael Forney reported an incorrect padding type that was defined in
the commit 80fe7430c708 ("ALSA: add new 32-bit layout for
snd_pcm_mmap_status/control") for PCM control mmap data.
His analysis is correct, and this caused the misplacements of PCM
control data on 32bit arch and 32bit compat mode.
The bug is that the __pad2 definition in __snd_pcm_mmap_control64
struct was wrongly with __pad_before_uframe, which should have been
__pad_after_uframe instead. This struct is used in SYNC_PTR ioctl and
control mmap. Basically this bug leads to two problems:
- The offset of avail_min field becomes wrong, it's placed right after
appl_ptr without padding on little-endian
- When appl_ptr and avail_min are read as 64bit values in kernel side,
the values become either zero or corrupted (mixed up)
One good news is that, because both user-space and kernel
misunderstand the wrong offset, at least, 32bit application running on
32bit kernel works as is. Also, 64bit applications are unaffected
because the padding size is zero. The remaining problem is the 32bit
compat mode; as mentioned in the above, avail_min is placed right
after appl_ptr on little-endian archs, 64bit kernel reads bogus values
for appl_ptr updates, which may lead to streaming bugs like jumping,
XRUN or whatever unexpected.
(However, we haven't heard any serious bug reports due to this over
years, so practically seen, it's fairly safe to assume that the impact
by this bug is limited.)
Ideally speaking, we should correct the wrong mmap status control
definition. But this would cause again incompatibility with the
existing binaries, and fixing it (e.g. by renumbering ioctls) would be
really messy.
So, as of this patch, we only correct the behavior of 32bit compat
mode and keep the rest as is. Namely, the SYNC_PTR ioctl is now
handled differently in compat mode to read/write the 32bit values at
the right offsets. The control mmap of 32bit apps on 64bit kernels
has been already disabled (which is likely rather an overlook, but
this worked fine at this time :), so covering SYNC_PTR ioctl should
suffice as a fallback.
Fixes: 80fe7430c708 ("ALSA: add new 32-bit layout for snd_pcm_mmap_status/control")
Reported-by: Michael Forney <mforney@mforney.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Cc: <stable@vger.kernel.org>
Cc: Rich Felker <dalias@libc.org>
Link: https://lore.kernel.org/r/29QBMJU8DE71E.2YZSH8IHT5HMH@mforney.org
Link: https://lore.kernel.org/r/20211010075546.23220-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2021-10-10 10:55:46 +03:00
|
|
|
return snd_pcm_ioctl_sync_ptr_buggy(substream, argp);
|
2005-04-17 02:20:36 +04: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);
|
2018-04-24 15:06:11 +03:00
|
|
|
case SNDRV_PCM_IOCTL_STATUS_COMPAT32:
|
|
|
|
return snd_pcm_status_user32(substream, argp, false);
|
|
|
|
case SNDRV_PCM_IOCTL_STATUS_EXT_COMPAT32:
|
|
|
|
return snd_pcm_status_user32(substream, argp, true);
|
2005-04-17 02:20:36 +04:00
|
|
|
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);
|
2018-04-24 15:06:11 +03:00
|
|
|
case SNDRV_PCM_IOCTL_STATUS_COMPAT64:
|
|
|
|
return snd_pcm_status_user_compat64(substream, argp, false);
|
|
|
|
case SNDRV_PCM_IOCTL_STATUS_EXT_COMPAT64:
|
|
|
|
return snd_pcm_status_user_compat64(substream, argp, true);
|
2022-03-14 22:48:41 +03:00
|
|
|
#ifdef CONFIG_X86_X32_ABI
|
2016-02-28 13:23:09 +03:00
|
|
|
case SNDRV_PCM_IOCTL_CHANNEL_INFO_X32:
|
|
|
|
return snd_pcm_ioctl_channel_info_x32(substream, argp);
|
2022-03-14 22:48:41 +03:00
|
|
|
#endif /* CONFIG_X86_X32_ABI */
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
return -ENOIOCTLCMD;
|
|
|
|
}
|