From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZpjP4DT1wsK2+d79XwhZXHKlUChp7FiN7+xu4zE8I8PYNOA8nCHBsC7ql9q2sobTttzsXwV ARC-Seal: i=1; a=rsa-sha256; t=1526280612; cv=none; d=google.com; s=arc-20160816; b=RSmDS+e2fCf+inC3w9ldKlHttYaIicwtF5W9Sc475t/NVemWNzUISWo8abR/ySq8/E xduiaXnhW/C3EpAs3Yz7J3NWbnsYw4DyZStpDfyDolxrkocJ4dyOTg+MwZmZSaAUR2/V 5q8U+/NijCHG4227V5NzfZ4hVLiVF6Ujyvx+KxSskeh+VZGy1sBcoXC2H18IQ4vyzzX9 NGQJ31tSGLCLKGMuY6nkycABL1yFjlAZI1I0Oz8X2hRj7I/kkv53VU+E4vzBmB67tEYJ apULzSZlL9oLZl2dHdhDeXjXQGw3F50xtb8EEmyvLNuhtXNLgvSxJQn43m0eguKjXj/b dhZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=xtWtOhR0eUDV43i04v7MfcgfR0TkyI7MZVWaablVXoY=; b=d7/gHuXKGVhK8ZDSX3Dxnfzch5L7nuvX7gZx4pu2KE41CUsD/XFiZ1T7LDcPYEReW9 aO9AvntlM5DAua40pyd4aA4T8bN7eF83ZBTYGSJ7t6uqaiFk7OrfpJAVJb3pjyRiB56v uxj5uHfELGLSOK3qQveEt/lFIUFDV/cRt24r+hiD+H96HAX1bXKH/kvH5gXB3OHGMokR dpMb6FaqQRANuWm8p7ZclNnQdZFk6EM/e6h5vvuPs2rnNpiE1Mghw0SsM4BA6HibBRne SzVjz1xenldqYnUYDw/kihEgKf5HQ4YqZVAAfxKmamtqY4/+yv/qHAKQ9hSQeuEQSngt TQdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sNdrfFKo; spf=pass (google.com: domain of srs0=ywzk=ib=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=ywzk=IB=linuxfoundation.org=gregkh@kernel.org Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sNdrfFKo; spf=pass (google.com: domain of srs0=ywzk=ib=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=ywzk=IB=linuxfoundation.org=gregkh@kernel.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, DaeRyong Jeong , Takashi Iwai Subject: [PATCH 3.18 07/23] ALSA: aloop: Add missing cable lock to ctl API callbacks Date: Mon, 14 May 2018 08:48:36 +0200 Message-Id: <20180514064704.364237172@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514064704.046463679@linuxfoundation.org> References: <20180514064704.046463679@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1600421218895255772?= X-GMAIL-MSGID: =?utf-8?q?1600421218895255772?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Takashi Iwai commit 76b3421b39bd610546931fc923edcf90c18fa395 upstream. Some control API callbacks in aloop driver are too lazy to take the loopback->cable_lock and it results in possible races of cable access while it's being freed. It eventually lead to a UAF, as reported by fuzzer recently. This patch covers such control API callbacks and add the proper mutex locks. Reported-by: DaeRyong Jeong Cc: Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/drivers/aloop.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) --- a/sound/drivers/aloop.c +++ b/sound/drivers/aloop.c @@ -833,9 +833,11 @@ static int loopback_rate_shift_get(struc { struct loopback *loopback = snd_kcontrol_chip(kcontrol); + mutex_lock(&loopback->cable_lock); ucontrol->value.integer.value[0] = loopback->setup[kcontrol->id.subdevice] [kcontrol->id.device].rate_shift; + mutex_unlock(&loopback->cable_lock); return 0; } @@ -867,9 +869,11 @@ static int loopback_notify_get(struct sn { struct loopback *loopback = snd_kcontrol_chip(kcontrol); + mutex_lock(&loopback->cable_lock); ucontrol->value.integer.value[0] = loopback->setup[kcontrol->id.subdevice] [kcontrol->id.device].notify; + mutex_unlock(&loopback->cable_lock); return 0; } @@ -881,12 +885,14 @@ static int loopback_notify_put(struct sn int change = 0; val = ucontrol->value.integer.value[0] ? 1 : 0; + mutex_lock(&loopback->cable_lock); if (val != loopback->setup[kcontrol->id.subdevice] [kcontrol->id.device].notify) { loopback->setup[kcontrol->id.subdevice] [kcontrol->id.device].notify = val; change = 1; } + mutex_unlock(&loopback->cable_lock); return change; } @@ -894,15 +900,18 @@ static int loopback_active_get(struct sn struct snd_ctl_elem_value *ucontrol) { struct loopback *loopback = snd_kcontrol_chip(kcontrol); - struct loopback_cable *cable = loopback->cables - [kcontrol->id.subdevice][kcontrol->id.device ^ 1]; + struct loopback_cable *cable; + unsigned int val = 0; + mutex_lock(&loopback->cable_lock); + cable = loopback->cables[kcontrol->id.subdevice][kcontrol->id.device ^ 1]; if (cable != NULL) { unsigned int running = cable->running ^ cable->pause; val = (running & (1 << SNDRV_PCM_STREAM_PLAYBACK)) ? 1 : 0; } + mutex_unlock(&loopback->cable_lock); ucontrol->value.integer.value[0] = val; return 0; } @@ -945,9 +954,11 @@ static int loopback_rate_get(struct snd_ { struct loopback *loopback = snd_kcontrol_chip(kcontrol); + mutex_lock(&loopback->cable_lock); ucontrol->value.integer.value[0] = loopback->setup[kcontrol->id.subdevice] [kcontrol->id.device].rate; + mutex_unlock(&loopback->cable_lock); return 0; } @@ -967,9 +978,11 @@ static int loopback_channels_get(struct { struct loopback *loopback = snd_kcontrol_chip(kcontrol); + mutex_lock(&loopback->cable_lock); ucontrol->value.integer.value[0] = loopback->setup[kcontrol->id.subdevice] [kcontrol->id.device].channels; + mutex_unlock(&loopback->cable_lock); return 0; }