From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A4B7C282CE for ; Tue, 4 Jun 2019 23:27:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 09910206B8 for ; Tue, 4 Jun 2019 23:27:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559690871; bh=V+/TvxzOuvg8YAit1YKi2j3UnpjrXo+YOrQMjg7yjJA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZZ4TeJLn2yY4iFmczLISFA+pyHRt8n1GB/r36MQmZmmhyR3AeahGAudjjedmWL9PY yOrpdWzaj0jxiRAsobgAPDlzZPED2rH4RtISKcti3qlVsyyovASzIFO61GnLbEOuxG E/41p/9ByvDVG242XzB+xX6H7AOioqs8lBq8PyIQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727853AbfFDXZH (ORCPT ); Tue, 4 Jun 2019 19:25:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:36524 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727820AbfFDXZE (ORCPT ); Tue, 4 Jun 2019 19:25:04 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 12FF9206C1; Tue, 4 Jun 2019 23:25:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559690703; bh=V+/TvxzOuvg8YAit1YKi2j3UnpjrXo+YOrQMjg7yjJA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QArXg9SR9MJVU6gJ50Zv3KaJJRUHzsUejKtbH9PZEFmyy98xi8wBzM26iY753/Iky KdZ356Sr58ItfkZsIoNKZrOVSZKcCajN9iwasmiKMJMGMz3Hkd9CSevPlqCqq/bNaZ ro21jxWa6AqHIbxX3sPaGF00JB1mI+BuzlEH0q7M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Takashi Iwai , syzbot+e4c8abb920efa77bace9@syzkaller.appspotmail.com, Sasha Levin Subject: [PATCH AUTOSEL 4.9 02/17] ALSA: seq: Protect in-kernel ioctl calls with mutex Date: Tue, 4 Jun 2019 19:24:43 -0400 Message-Id: <20190604232459.7745-2-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190604232459.7745-1-sashal@kernel.org> References: <20190604232459.7745-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Iwai [ Upstream commit feb689025fbb6f0aa6297d3ddf97de945ea4ad32 ] ALSA OSS sequencer calls the ioctl function indirectly via snd_seq_kernel_client_ctl(). While we already applied the protection against races between the normal ioctls and writes via the client's ioctl_mutex, this code path was left untouched. And this seems to be the cause of still remaining some rare UAF as spontaneously triggered by syzkaller. For the sake of robustness, wrap the ioctl_mutex also for the call via snd_seq_kernel_client_ctl(), too. Reported-by: syzbot+e4c8abb920efa77bace9@syzkaller.appspotmail.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/core/seq/seq_clientmgr.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index 09491b27092e..3b1b2e9fb33e 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c @@ -2354,14 +2354,19 @@ int snd_seq_kernel_client_ctl(int clientid, unsigned int cmd, void *arg) { const struct ioctl_handler *handler; struct snd_seq_client *client; + int err; client = clientptr(clientid); if (client == NULL) return -ENXIO; for (handler = ioctl_handlers; handler->cmd > 0; ++handler) { - if (handler->cmd == cmd) - return handler->func(client, arg); + if (handler->cmd == cmd) { + mutex_lock(&client->ioctl_mutex); + err = handler->func(client, arg); + mutex_unlock(&client->ioctl_mutex); + return err; + } } pr_debug("ALSA: seq unknown ioctl() 0x%x (type='%c', number=0x%02x)\n", -- 2.20.1