6977966888
- Backport upstream fix patches, including the deadlock fix for aplay/arecord (boo#1031525): 0001-ucm-Add-ATTRIBUTE_UNUSED-for-unused-parameters-of-ex.patch 0002-ucm-parser-needs-limits.h.patch 0003-pcm-direct-allow-users-to-configure-different-period.patch 0004-pcm-dshare-enable-silence.patch 0005-pcm-rate-fix-the-hw_ptr-update-until-the-boundary-av.patch 0006-plugin-dynamically-update-avail_min-on-slave.patch 0007-rate-dynamic-update-avail_min-on-slave.patch 0008-topology-fix-unused-const-variable-warning.patch 0009-seq-improve-documentation-about-new-get-pid-card-fun.patch 0010-pcm-direct-returning-semop-error-code-for-semaphore-.patch 0011-pcm-direct-Fix-for-sync-issue-on-xrun-recover.patch 0012-pcm-direct-check-state-before-enter-poll-on-timer.patch 0013-pcm-direct-don-t-return-bogus-buffer-levels-in-xrun-.patch 0014-conf-ucm-broxton-add-broxton-rt298-conf-files.patch 0015-pcm-direct-Fix-deadlock-in-poll_descriptors.patch 0016-ucm-Assure-the-user-input-card-name-not-to-exceed-ma.patch 0017-ucm-Load-device-specific-configuration-file-based-on.patch 0018-ucm-Add-command-get-_file-to-get-the-config-file-nam.patch 0019-topology-Fix-incorrect-license-in-source-comments.patch 0020-conf-cards-add-support-for-pistachio-card.patch 0021-pcm-multi-Drop-the-fixed-slave_map-in-snd_pcm_multi_.patch 0022-conf-Add-card-config-for-Intel-HDMI-DP-LPE-audio.patch 0023-pcm-Avoid-lock-for-snd_pcm_nonblock.patch 0024-pcm-Disable-locking-in-async-mode.patch 0025-pcm-dmix-Allow-disabling-x86-optimizations.patch 0026-pcm-dmix_rewind-corrupts-application-pointer-fix.patch 0027-pcm-direct-fix-race-on-clearing-timer-events.patch 0028-pcm-file-Enable-file-writing-for-capture-path.patch OBS-URL: https://build.opensuse.org/request/show/483406 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=210
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
From 2b9b3f013467765219c8ab8a50943d3c7db68f75 Mon Sep 17 00:00:00 2001
|
|
From: Mengdong Lin <mengdong.lin@linux.intel.com>
|
|
Date: Wed, 18 Jan 2017 11:52:35 +0800
|
|
Subject: [PATCH 16/43] ucm: Assure the user input card name not to exceed max
|
|
size of card long name
|
|
|
|
Users can load a card's UCM configuration file by giving the card short
|
|
name or long name, which should not exceed the maximum card long name
|
|
defined by the kernel. The kernel uses an 80-character buffer to store
|
|
the card long name.
|
|
|
|
Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/ucm/parser.c | 6 ++++++
|
|
src/ucm/ucm_local.h | 1 +
|
|
2 files changed, 7 insertions(+)
|
|
|
|
--- a/src/ucm/parser.c
|
|
+++ b/src/ucm/parser.c
|
|
@@ -1335,6 +1335,12 @@ static int load_master_config(const char
|
|
char *env = getenv(ALSA_CONFIG_UCM_VAR);
|
|
int err;
|
|
|
|
+ if (strnlen(card_name, MAX_CARD_LONG_NAME) == MAX_CARD_LONG_NAME) {
|
|
+ uc_error("error: invalid card name %s (at most %d chars)\n",
|
|
+ card_name, MAX_CARD_LONG_NAME - 1);
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
snprintf(filename, sizeof(filename)-1,
|
|
"%s/%s/%s.conf", env ? env : ALSA_USE_CASE_DIR,
|
|
card_name, card_name);
|
|
--- a/src/ucm/ucm_local.h
|
|
+++ b/src/ucm/ucm_local.h
|
|
@@ -41,6 +41,7 @@
|
|
#include "use-case.h"
|
|
|
|
#define MAX_FILE 256
|
|
+#define MAX_CARD_LONG_NAME 80
|
|
#define ALSA_USE_CASE_DIR ALSA_CONFIG_DIR "/ucm"
|
|
|
|
#define SEQUENCE_ELEMENT_TYPE_CDEV 1
|