Changes in 4.9.331 uas: add no-uas quirk for Hiksemi usb_disk usb-storage: Add Hiksemi USB3-FW to IGNORE_UAS uas: ignore UAS for Thinkplus chips net: usb: qmi_wwan: Add new usb-id for Dell branded EM7455 ntfs: fix BUG_ON in ntfs_lookup_inode_by_name() mmc: moxart: fix 4-bit bus width and remove 8-bit bus width mm: prevent page_frag_alloc() from corrupting the memory Revert "drm: bridge: analogix/dp: add panel prepare/unprepare in suspend/resume time" Input: melfas_mip4 - fix return value check in mip4_probe() usbnet: Fix memory leak in usbnet_disconnect() nvme: add new line after variable declatation nvme: Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices selftests: Fix the if conditions of in test_extra_filter() clk: iproc: Minor tidy up of iproc pll data structures clk: iproc: Do not rely on node name for correct PLL setup Makefile.extrawarn: Move -Wcast-function-type-strict to W=1 ARM: fix function graph tracer and unwinder dependencies fs: fix UAF/GPF bug in nilfs_mdt_destroy dmaengine: xilinx_dma: cleanup for fetching xlnx,num-fstores property dmaengine: xilinx_dma: Report error in case of dma_set_mask_and_coherent API failure ARM: dts: fix Moxa SDIO 'compatible', remove 'sdhci' misnomer net/ieee802154: fix uninit value bug in dgram_sendmsg um: Cleanup syscall_handler_t cast in syscalls_32.h um: Cleanup compiler warning in arch/x86/um/tls_32.c usb: mon: make mmapped memory read only USB: serial: ftdi_sio: fix 300 bps rate for SIO nilfs2: fix NULL pointer dereference at nilfs_bmap_lookup_at_level() nilfs2: fix leak of nilfs_root in case of writer thread creation failure nilfs2: replace WARN_ONs by nilfs_error for checkpoint acquisition failure ceph: don't truncate file in atomic_open random: clamp credited irq bits to maximum mixed ALSA: hda: Fix position reporting on Poulsbo scsi: stex: Properly zero out the passthrough command structure USB: serial: qcserial: add new usb-id for Dell branded EM7455 random: avoid reading two cache lines on irq randomness wifi: mac80211_hwsim: avoid mac80211 warning on bad rate random: restore O_NONBLOCK support Input: xpad - add supported devices as contributed on github Input: xpad - fix wireless 360 controller breaking after suspend random: use expired timer rather than wq for mixing fast pool ALSA: oss: Fix potential deadlock at unregistration ALSA: rawmidi: Drop register_mutex in snd_rawmidi_free() ALSA: usb-audio: Fix potential memory leaks ALSA: usb-audio: Fix NULL dererence at error path iio: dac: ad5593r: Fix i2c read protocol requirements fs: dlm: fix race between test_bit() and queue_work() fs: dlm: handle -EBUSY first in lock arg validation quota: Check next/prev free block number after reading from quota file regulator: qcom_rpm: Fix circular deferral regression parisc: fbdev/stifb: Align graphics memory size to 4MB UM: cpuinfo: Fix a warning for CONFIG_CPUMASK_OFFSTACK PCI: Sanitise firmware BAR assignments behind a PCI-PCI bridge fbdev: smscufx: Fix use-after-free in ufx_ops_open() nilfs2: fix use-after-free bug of struct nilfs_root ext4: avoid crash when inline data creation follows DIO write ext4: fix null-ptr-deref in ext4_write_info ext4: make ext4_lazyinit_thread freezable ext4: place buffer head allocation before handle start ring-buffer: Allow splice to read previous partially read pages ring-buffer: Check pending waiters when doing wake ups as well ring-buffer: Fix race between reset page and reading page KVM: x86/emulator: Fix handing of POP SS to correctly set interruptibility selinux: use "grep -E" instead of "egrep" sh: machvec: Use char[] for section boundaries wifi: ath10k: add peer map clean up for peer delete in ath10k_sta_state() wifi: mac80211: allow bw change during channel switch in mesh wifi: rtl8xxxu: tighten bounds checking in rtl8xxxu_read_efuse() spi: qup: add missing clk_disable_unprepare on error in spi_qup_resume() spi: qup: add missing clk_disable_unprepare on error in spi_qup_pm_resume_runtime() wifi: rtl8xxxu: gen2: Fix mistake in path B IQ calibration net: fs_enet: Fix wrong check in do_pd_setup spi/omap100k:Fix PM disable depth imbalance in omap1_spi100k_probe mISDN: fix use-after-free bugs in l1oip timer handlers tcp: fix tcp_cwnd_validate() to not forget is_cwnd_limited net: rds: don't hold sock lock when cancelling work from rds_tcp_reset_callbacks() bnx2x: fix potential memory leak in bnx2x_tpa_stop() drm/mipi-dsi: Detach devices when removing the host platform/x86: msi-laptop: Fix old-ec check for backlight registering mmc: au1xmmc: Fix an error handling path in au1xmmc_probe() ASoC: eureka-tlv320: Hold reference returned from of_find_xxx API ALSA: dmaengine: increment buffer pointer atomically memory: of: Fix refcount leak bug in of_get_ddr_timings() soc: qcom: smsm: Fix refcount leak bugs in qcom_smsm_probe() soc: qcom: smem_state: Add refcounting for the 'state->of_node' ARM: dts: kirkwood: lsxl: fix serial line ARM: dts: kirkwood: lsxl: remove first ethernet port ARM: Drop CMDLINE_* dependency on ATAGS ARM: dts: exynos: fix polarity of VBUS GPIO of Origen iio: adc: at91-sama5d2_adc: fix AT91_SAMA5D2_MR_TRACKTIM_MAX iio: inkern: only release the device node when done with it iio: ABI: Fix wrong format of differential capacitance channel ABI. clk: tegra: Fix refcount leak in tegra210_clock_init clk: tegra: Fix refcount leak in tegra114_clock_init clk: tegra20: Fix refcount leak in tegra20_clock_init HSI: omap_ssi: Fix refcount leak in ssi_probe HSI: omap_ssi_port: Fix dma_map_sg error check media: exynos4-is: fimc-is: Add of_node_put() when breaking out of loop tty: xilinx_uartps: Fix the ignore_status media: xilinx: vipp: Fix refcount leak in xvip_graph_dma_init RDMA/rxe: Fix "kernel NULL pointer dereference" error RDMA/rxe: Fix the error caused by qp->sk dyndbg: fix module.dyndbg handling dyndbg: let query-modname override actual module name ata: fix ata_id_sense_reporting_enabled() and ata_id_has_sense_reporting() ata: fix ata_id_has_devslp() ata: fix ata_id_has_ncq_autosense() ata: fix ata_id_has_dipm() drivers: serial: jsm: fix some leaks in probe firmware: google: Test spinlock on panic path to avoid lockups serial: 8250: Fix restoring termios speed after suspend mfd: intel_soc_pmic: Fix an error handling path in intel_soc_pmic_i2c_probe() mfd: lp8788: Fix an error handling path in lp8788_probe() mfd: lp8788: Fix an error handling path in lp8788_irq_init() and lp8788_irq_init() mfd: sm501: Add check for platform_driver_register() dmaengine: ioat: stop mod_timer from resurrecting deleted timer in __cleanup() clk: bcm2835: fix bcm2835_clock_rate_from_divisor declaration clk: ti: dra7-atl: Fix reference leak in of_dra7_atl_clk_probe powerpc/math_emu/efp: Include module.h powerpc/pci_dn: Add missing of_node_put() powerpc: Fix SPE Power ISA properties for e500v1 platforms iommu/omap: Fix buffer overflow in debugfs f2fs: fix race condition on setting FI_NO_EXTENT flag ACPI: video: Add Toshiba Satellite/Portege Z830 quirk MIPS: BCM47XX: Cast memcmp() of function to (void *) powercap: intel_rapl: fix UBSAN shift-out-of-bounds issue thermal: intel_powerclamp: Use get_cpu() instead of smp_processor_id() to avoid crash openvswitch: Fix double reporting of drops in dropwatch openvswitch: Fix overreporting of drops in dropwatch tcp: annotate data-race around tcp_md5sig_pool_populated xfrm: Update ipcomp_scratches with NULL when freed Bluetooth: L2CAP: initialize delayed works at l2cap_chan_create() Bluetooth: hci_sysfs: Fix attempting to call device_add multiple times can: bcm: check the result of can_send() in bcm_can_tx() wifi: rt2x00: don't run Rt5592 IQ calibration on MT7620 Bluetooth: L2CAP: Fix user-after-free r8152: Rate limit overflow messages drm: Use size_t type for len variable in drm_copy_field() drm: Prevent drm_copy_field() to attempt copying a NULL pointer platform/x86: msi-laptop: Change DMI match / alias strings to fix module autoloading drm/amdgpu: fix initial connector audio value ARM: dts: imx7d-sdb: config the max pressure for tsc2046 ARM: dts: imx6q: add missing properties for sram ARM: dts: imx6dl: add missing properties for sram ARM: dts: imx6qp: add missing properties for sram ARM: dts: imx6sl: add missing properties for sram media: cx88: Fix a null-ptr-deref bug in buffer_prepare() scsi: 3w-9xxx: Avoid disabling device if failing to enable it HID: roccat: Fix use-after-free in roccat_read() usb: host: xhci: Fix potential memory leak in xhci_alloc_stream_info() usb: musb: Fix musb_gadget.c rxstate overflow bug Revert "usb: storage: Add quirk for Samsung Fit flash" usb: idmouse: fix an uninit-value in idmouse_open perf intel-pt: Fix segfault in intel_pt_print_info() with uClibc net: ieee802154: return -EINVAL for unknown addr type net/ieee802154: don't warn zero-sized raw_sendmsg() ext4: continue to expand file system when the target size doesn't reach inet: fully convert sk->sk_rx_dst to RCU rules thermal: intel_powerclamp: Use first online CPU as control_cpu gcov: support GCC 12.1 and newer compilers Linux 4.9.331 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I105d6215a29d200abe3330f328ce3c2009ba0df9
268 lines
7.3 KiB
C
268 lines
7.3 KiB
C
/*
|
|
* Advanced Linux Sound Architecture
|
|
* Copyright (c) by Jaroslav Kysela <perex@perex.cz>
|
|
*
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/export.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/time.h>
|
|
#include <sound/core.h>
|
|
#include <sound/minors.h>
|
|
#include <sound/info.h>
|
|
#include <linux/sound.h>
|
|
#include <linux/mutex.h>
|
|
|
|
#define SNDRV_OSS_MINORS 256
|
|
|
|
static struct snd_minor *snd_oss_minors[SNDRV_OSS_MINORS];
|
|
static DEFINE_MUTEX(sound_oss_mutex);
|
|
|
|
/* NOTE: This function increments the refcount of the associated card like
|
|
* snd_lookup_minor_data(); the caller must call snd_card_unref() appropriately
|
|
*/
|
|
void *snd_lookup_oss_minor_data(unsigned int minor, int type)
|
|
{
|
|
struct snd_minor *mreg;
|
|
void *private_data;
|
|
|
|
if (minor >= ARRAY_SIZE(snd_oss_minors))
|
|
return NULL;
|
|
mutex_lock(&sound_oss_mutex);
|
|
mreg = snd_oss_minors[minor];
|
|
if (mreg && mreg->type == type) {
|
|
private_data = mreg->private_data;
|
|
if (private_data && mreg->card_ptr)
|
|
get_device(&mreg->card_ptr->card_dev);
|
|
} else
|
|
private_data = NULL;
|
|
mutex_unlock(&sound_oss_mutex);
|
|
return private_data;
|
|
}
|
|
|
|
EXPORT_SYMBOL(snd_lookup_oss_minor_data);
|
|
|
|
static int snd_oss_kernel_minor(int type, struct snd_card *card, int dev)
|
|
{
|
|
int minor;
|
|
|
|
switch (type) {
|
|
case SNDRV_OSS_DEVICE_TYPE_MIXER:
|
|
if (snd_BUG_ON(!card || dev < 0 || dev > 1))
|
|
return -EINVAL;
|
|
minor = SNDRV_MINOR_OSS(card->number, (dev ? SNDRV_MINOR_OSS_MIXER1 : SNDRV_MINOR_OSS_MIXER));
|
|
break;
|
|
case SNDRV_OSS_DEVICE_TYPE_SEQUENCER:
|
|
minor = SNDRV_MINOR_OSS_SEQUENCER;
|
|
break;
|
|
case SNDRV_OSS_DEVICE_TYPE_MUSIC:
|
|
minor = SNDRV_MINOR_OSS_MUSIC;
|
|
break;
|
|
case SNDRV_OSS_DEVICE_TYPE_PCM:
|
|
if (snd_BUG_ON(!card || dev < 0 || dev > 1))
|
|
return -EINVAL;
|
|
minor = SNDRV_MINOR_OSS(card->number, (dev ? SNDRV_MINOR_OSS_PCM1 : SNDRV_MINOR_OSS_PCM));
|
|
break;
|
|
case SNDRV_OSS_DEVICE_TYPE_MIDI:
|
|
if (snd_BUG_ON(!card || dev < 0 || dev > 1))
|
|
return -EINVAL;
|
|
minor = SNDRV_MINOR_OSS(card->number, (dev ? SNDRV_MINOR_OSS_MIDI1 : SNDRV_MINOR_OSS_MIDI));
|
|
break;
|
|
case SNDRV_OSS_DEVICE_TYPE_DMFM:
|
|
minor = SNDRV_MINOR_OSS(card->number, SNDRV_MINOR_OSS_DMFM);
|
|
break;
|
|
case SNDRV_OSS_DEVICE_TYPE_SNDSTAT:
|
|
minor = SNDRV_MINOR_OSS_SNDSTAT;
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
if (minor < 0 || minor >= SNDRV_OSS_MINORS)
|
|
return -EINVAL;
|
|
return minor;
|
|
}
|
|
|
|
int snd_register_oss_device(int type, struct snd_card *card, int dev,
|
|
const struct file_operations *f_ops, void *private_data)
|
|
{
|
|
int minor = snd_oss_kernel_minor(type, card, dev);
|
|
int minor_unit;
|
|
struct snd_minor *preg;
|
|
int cidx = SNDRV_MINOR_OSS_CARD(minor);
|
|
int track2 = -1;
|
|
int register1 = -1, register2 = -1;
|
|
struct device *carddev = snd_card_get_device_link(card);
|
|
|
|
if (card && card->number >= SNDRV_MINOR_OSS_DEVICES)
|
|
return 0; /* ignore silently */
|
|
if (minor < 0)
|
|
return minor;
|
|
preg = kmalloc(sizeof(struct snd_minor), GFP_KERNEL);
|
|
if (preg == NULL)
|
|
return -ENOMEM;
|
|
preg->type = type;
|
|
preg->card = card ? card->number : -1;
|
|
preg->device = dev;
|
|
preg->f_ops = f_ops;
|
|
preg->private_data = private_data;
|
|
preg->card_ptr = card;
|
|
mutex_lock(&sound_oss_mutex);
|
|
snd_oss_minors[minor] = preg;
|
|
minor_unit = SNDRV_MINOR_OSS_DEVICE(minor);
|
|
switch (minor_unit) {
|
|
case SNDRV_MINOR_OSS_PCM:
|
|
track2 = SNDRV_MINOR_OSS(cidx, SNDRV_MINOR_OSS_AUDIO);
|
|
break;
|
|
case SNDRV_MINOR_OSS_MIDI:
|
|
track2 = SNDRV_MINOR_OSS(cidx, SNDRV_MINOR_OSS_DMMIDI);
|
|
break;
|
|
case SNDRV_MINOR_OSS_MIDI1:
|
|
track2 = SNDRV_MINOR_OSS(cidx, SNDRV_MINOR_OSS_DMMIDI1);
|
|
break;
|
|
}
|
|
register1 = register_sound_special_device(f_ops, minor, carddev);
|
|
if (register1 != minor)
|
|
goto __end;
|
|
if (track2 >= 0) {
|
|
register2 = register_sound_special_device(f_ops, track2,
|
|
carddev);
|
|
if (register2 != track2)
|
|
goto __end;
|
|
snd_oss_minors[track2] = preg;
|
|
}
|
|
mutex_unlock(&sound_oss_mutex);
|
|
return 0;
|
|
|
|
__end:
|
|
if (register2 >= 0)
|
|
unregister_sound_special(register2);
|
|
if (register1 >= 0)
|
|
unregister_sound_special(register1);
|
|
snd_oss_minors[minor] = NULL;
|
|
mutex_unlock(&sound_oss_mutex);
|
|
kfree(preg);
|
|
return -EBUSY;
|
|
}
|
|
|
|
EXPORT_SYMBOL(snd_register_oss_device);
|
|
|
|
int snd_unregister_oss_device(int type, struct snd_card *card, int dev)
|
|
{
|
|
int minor = snd_oss_kernel_minor(type, card, dev);
|
|
int cidx = SNDRV_MINOR_OSS_CARD(minor);
|
|
int track2 = -1;
|
|
struct snd_minor *mptr;
|
|
|
|
if (card && card->number >= SNDRV_MINOR_OSS_DEVICES)
|
|
return 0;
|
|
if (minor < 0)
|
|
return minor;
|
|
mutex_lock(&sound_oss_mutex);
|
|
mptr = snd_oss_minors[minor];
|
|
if (mptr == NULL) {
|
|
mutex_unlock(&sound_oss_mutex);
|
|
return -ENOENT;
|
|
}
|
|
switch (SNDRV_MINOR_OSS_DEVICE(minor)) {
|
|
case SNDRV_MINOR_OSS_PCM:
|
|
track2 = SNDRV_MINOR_OSS(cidx, SNDRV_MINOR_OSS_AUDIO);
|
|
break;
|
|
case SNDRV_MINOR_OSS_MIDI:
|
|
track2 = SNDRV_MINOR_OSS(cidx, SNDRV_MINOR_OSS_DMMIDI);
|
|
break;
|
|
case SNDRV_MINOR_OSS_MIDI1:
|
|
track2 = SNDRV_MINOR_OSS(cidx, SNDRV_MINOR_OSS_DMMIDI1);
|
|
break;
|
|
}
|
|
if (track2 >= 0)
|
|
snd_oss_minors[track2] = NULL;
|
|
snd_oss_minors[minor] = NULL;
|
|
mutex_unlock(&sound_oss_mutex);
|
|
|
|
/* call unregister_sound_special() outside sound_oss_mutex;
|
|
* otherwise may deadlock, as it can trigger the release of a card
|
|
*/
|
|
unregister_sound_special(minor);
|
|
if (track2 >= 0)
|
|
unregister_sound_special(track2);
|
|
|
|
kfree(mptr);
|
|
return 0;
|
|
}
|
|
|
|
EXPORT_SYMBOL(snd_unregister_oss_device);
|
|
|
|
/*
|
|
* INFO PART
|
|
*/
|
|
|
|
#ifdef CONFIG_SND_PROC_FS
|
|
static const char *snd_oss_device_type_name(int type)
|
|
{
|
|
switch (type) {
|
|
case SNDRV_OSS_DEVICE_TYPE_MIXER:
|
|
return "mixer";
|
|
case SNDRV_OSS_DEVICE_TYPE_SEQUENCER:
|
|
case SNDRV_OSS_DEVICE_TYPE_MUSIC:
|
|
return "sequencer";
|
|
case SNDRV_OSS_DEVICE_TYPE_PCM:
|
|
return "digital audio";
|
|
case SNDRV_OSS_DEVICE_TYPE_MIDI:
|
|
return "raw midi";
|
|
case SNDRV_OSS_DEVICE_TYPE_DMFM:
|
|
return "hardware dependent";
|
|
default:
|
|
return "?";
|
|
}
|
|
}
|
|
|
|
static void snd_minor_info_oss_read(struct snd_info_entry *entry,
|
|
struct snd_info_buffer *buffer)
|
|
{
|
|
int minor;
|
|
struct snd_minor *mptr;
|
|
|
|
mutex_lock(&sound_oss_mutex);
|
|
for (minor = 0; minor < SNDRV_OSS_MINORS; ++minor) {
|
|
if (!(mptr = snd_oss_minors[minor]))
|
|
continue;
|
|
if (mptr->card >= 0)
|
|
snd_iprintf(buffer, "%3i: [%i-%2i]: %s\n", minor,
|
|
mptr->card, mptr->device,
|
|
snd_oss_device_type_name(mptr->type));
|
|
else
|
|
snd_iprintf(buffer, "%3i: : %s\n", minor,
|
|
snd_oss_device_type_name(mptr->type));
|
|
}
|
|
mutex_unlock(&sound_oss_mutex);
|
|
}
|
|
|
|
|
|
int __init snd_minor_info_oss_init(void)
|
|
{
|
|
struct snd_info_entry *entry;
|
|
|
|
entry = snd_info_create_module_entry(THIS_MODULE, "devices", snd_oss_root);
|
|
if (!entry)
|
|
return -ENOMEM;
|
|
entry->c.text.read = snd_minor_info_oss_read;
|
|
return snd_info_register(entry); /* freed in error path */
|
|
}
|
|
#endif /* CONFIG_SND_PROC_FS */
|