From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 18D03606A31B for ; Wed, 4 Nov 2026 17:29:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=GEKJ5oBt Received: by kanga.kvack.org (Postfix) id 347556B05BE; Wed, 4 Nov 2026 12:29:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F7876B05BF; Wed, 4 Nov 2026 12:29:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E6206B05C0; Wed, 4 Nov 2026 12:29:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E90A76B05BE for ; Wed, 4 Nov 2026 12:29:38 -0500 (EST) Received: from smtpin07.hostedemail.com (lb01a-stub [10.200.18.249]) by unirelay10.hostedemail.com (Postfix) with ESMTP id BBFE8C07A9 for ; Wed, 4 Nov 2026 17:29:37 +0000 (UTC) X-FDA: 85398123594.07.7740E41 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf09.hostedemail.com (Postfix) with ESMTP id E5A3614000C for ; Wed, 4 Nov 2026 17:29:35 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20260515 header.b=GEKJ5oBt; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf09.hostedemail.com: domain of brauner@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=brauner@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1793813376; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=9+yARzdOpzdllKXUJ7Oz/hxaICj5Mm35ej5JnL7jd2E=; b=UgsAKHbfxUCCUqa3ufCxZ+6CHCfmZwTj3NOmvRfRfkEbZBjJIUhOUWHIy6oW3i0q9tlLOS VvHvYG2zTGjVjJHMYr6LyLaeh+WdVPJ5zO0Eiz8LkVkPAauKBsHCNZMcdOnjh2hMrvqkOs W9WU2RbvI4jBXfZEnKGeUUk35Aq3k+Q= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20260515 header.b=GEKJ5oBt; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf09.hostedemail.com: domain of brauner@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=brauner@kernel.org ARC-Seal: i=1; a=rsa-sha256; d=hostedemail.com; s=arc-20220608; cv=none; t=1793813376; b=nq6JA7hP6lwAKbogdv6YGTkaB5fKgTWSyyYwzMKhxxYsXbor7mtGSUjrlxvZgnLpEoC/ME 2GiWCagSHb83vmqXeCqy8ILNnvMb4ILRLfZzpvzcqfd2AoJtSLEp+bj1E6la+EfCUOXlSH wu94RlIWZ5cxZ88buYmcWFbiiKwS+lw= Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 30C9B40C24; Wed, 4 Nov 2026 17:29:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 641541F0093A; Wed, 4 Nov 2026 17:29:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1793813375; bh=9+yARzdOpzdllKXUJ7Oz/hxaICj5Mm35ej5JnL7jd2E=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=GEKJ5oBtLs1Ued5KRzNH5ufzbODMyZ6PKn/Udd/hvL22vNsuoFBfVggV2ZFxVjqP4 8F6aIiAZmFuauOKTCLsqRblXf+tPD9fnHwb6IvcjUGRXyp5jYpp7RSlQRYmw3/tKTN 3hMTsxwcM7o+Kilf/qR1r6m4VjBReM+Zmlafux1A+LYZbzqYGdtm7xeTAIKiPpNlNL g4/R+I932DYQ/ARbsO2FY4bDvIYVnkPqPp5PHE+IMmU+7MpzPMNLR8uYrmx3l5Cm5R oPZrT41KRDe91uyE80CWxhIqW85F4PsqrtLkGrQKTz3AeHWg2FuAsXTXsMj7Uv14PH 8ydiIpfAzbpUw== From: Christian Brauner Date: Wed, 04 Nov 2026 18:27:21 +0100 Subject: [PATCH v2 04/51] PNP: isapnp: don't go on when isapnp_cfg_begin() fails X-Archived-By: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261104-work-procfs-bugfixes-v2-4-bbf7d5546809@kernel.org> References: <20261104-work-procfs-bugfixes-v2-0-bbf7d5546809@kernel.org> In-Reply-To: <20261104-work-procfs-bugfixes-v2-0-bbf7d5546809@kernel.org> To: linux-fsdevel@vger.kernel.org Cc: Linus Torvalds , Jann Horn , Josef Bacik , Chris Mason , Jeff Layton , NeilBrown , Eric Dumazet , Thomas Gleixner , Al Viro , Jonathan Corbet , Christoph Hellwig , Greg Kroah-Hartman , Joel Granados , Kees Cook , Jan Kara , Jan Kara , linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org, linux-um@lists.infradead.org, linux-wireless@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, netdev@vger.kernel.org, ntfs3@lists.linux.dev, platform-driver-x86@vger.kernel.org, coreteam@netfilter.org, kexec@lists.infradead.org, linux-pci@vger.kernel.org, linux-sound@vger.kernel.org, netfilter-devel@vger.kernel.org, dri-devel@lists.freedesktop.org, ibm-acpi-devel@lists.sourceforge.net, jfs-discussion@lists.sourceforge.net, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-cifs@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-hwmon@vger.kernel.org, linux-mm@kvack.org, linux-sh@vger.kernel.org, linux-usb@vger.kernel.org, samba-technical@lists.samba.org, sparclinux@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-doc@vger.kernel.org, linux-serial@vger.kernel.org, linux-atm-general@lists.sourceforge.net, Takashi Iwai , linux-input@vger.kernel.org, linux-raid@vger.kernel.org, linux-ext4@vger.kernel.org, linux-modules@vger.kernel.org, linux-debuggers@vger.kernel.org, "Christian Brauner (Amutable)" , Chuck Lever , stable@vger.kernel.org X-Mailer: b4 0.17-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=3910; i=brauner@kernel.org; h=from:subject:message-id; bh=zJWqbpFP7Eog9HhLBr1/8hQ7kUfFg3Bc340XkbmHZ+k=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMWS9zvqrMu+3ucHOq8s8Hi6dUyBieqBr4iYJ9fLMtfG+8 hk+XGY5HaUsDGJcDLJiiiwO7Sbhcst5KjYbZWrAzGFlAhnCwMUpABOxkGT4Z1x3X32vSsH+H8de Tzy0tm6dPV/iyZO8NQtV2Rd9k3CX7mdk+Gmf7XH+YJVede/Zl5mfRZNs98TPb/HRte7TWrnzoYE JLwA= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: E5A3614000C X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=4.0.1 X-Stat-Signature: mmahhtqqp8fkhfzza8i7wif5z9yod7pb X-HE-Tag: 1793813375-754488 X-HE-Meta: U2FsdGVkX1+XPeB+U815xo7FwCQwSL2ZfEzH+wqAJRNKYwiBg638ASvqAH3QMCYwKWn8psRqjWL02ZAeWlNv7RcgkxiXc5AipylIu47j0tqaOpRa2jtY3GLTxp1ed4lpAtvAxTj3wuGc7gEhxMchBjrLXxA7O74LZhoUDG7SEmisW22E+KJVTgyXMaRsJu3/VOzF+J/ymiJ0BlAcgX1R7S97kLHYhCBwWnHzOwT2joqNDw1fmaPs8Sb/E7UEQ48A3cIFfp7N/erLkmMxZsU6jDk9qnWd6XYbVPRD3cTsBKMZ2lCa8jIzqjNIP+dCt0R6WvLMhdV0VAfuKgBwXX38H+pmVuaiLTAJV3IlBExMLazPUCExUBX4GC76lD1WF11WSoO7UsPhavIDj6dAzykrJOaKgPbJp5ZrXbuou4z3joFWnGff/3GfG9Bo13yKn2VrDEHeAzs0NNIUsXhJWBIk8jzgwjVH22/ig34sqdOojahZPHsFEM0scGJjVB3G14nt4szFgJE9rfyz6Ppbgfr7qrUhpDJo5PQyZsJMC1csw5qenKr6jzP/1rIdUtzJ8YX+e/eixV++1/yavOqgJC4kH4uIa+sMyLu4lHr7twkGzw2XqeR0f7FZjJ82eXvrPh9CuNbHTKs9uhvMQx4Ip7jjqSm6xNc8y14ncG6hLeBVZvDUrOONX4m/Nrm9Ry8uph60VGLCnND5fQHdaLuyEZZRnm/tFv/47myPElHqwCHBpAULS9r4LMimaRC9gSSOfcw3asjyZt7LwiicDh3z6gYlAT0z3jYHEURyPMn4ImWcwP1auN2mlzuWfnelf0iY804EYNYtdwYFbqA4cBhoO/lGvfAE5BwTPlyghFB3DNHhobP2ljqwRZcrTpChfzKvWoCHpef2EttPMIikKGh1zBbOtkOJQoJsBfMTHcNnHNjFhIDc2Zc5+jQ2jN0j+nF6WqSSxIvoiPROKKniDJFqIZt b4/8QEh/ vEAMaGMOHClV4XxzIBi9lUjJtyD28Cg6E+J4pwdeUeg1f0BJmOFafroM/Mo7XA77xAZXj3pfZSyG/pgX4ahnxs0uKsOeCSLRunyPnKHISEINmxF0BjIEhbD+T+j6z48/SShf3GlFXJoY10VFfZ+3mwp8xN8iQTss+wQ4RFFtbRv/Ddm6eXUNUdgiHM4VC3i1WxtPPeKilR/ZnL+VRShpKdo8izYPSMPh4mDnuB4FbJ7HfwPJ1yFjuLeOWlXGdqwgBAj2nyPmbnz62xDKIAbTz8uC3JFNIkclVbx6WYAZasLA+1Gxpdusus37FO6An32GFMjOVyI0nmrBXy3wrd2FSB4OCfNUv96tMECGUbp3ComGkjJ4= Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 isapnp_cfg_begin() refuses a logical device number above 10 and a bad card number with -EINVAL before it takes isapnp_cfg_mutex. The callers that read and write the device's configuration, the proc file included, don't look at that: they go on talking to whatever device the card currently has selected and then unlock a mutex they never took in isapnp_cfg_end(). isapnp_create_device() hands out logical device numbers without a bound, so a card with twelve or more logical devices gets there. Return the error instead. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable@vger.kernel.org Signed-off-by: Christian Brauner (Amutable) --- drivers/pnp/isapnp/core.c | 16 ++++++++++++---- drivers/pnp/isapnp/proc.c | 5 ++++- sound/isa/es18xx.c | 6 +++++- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c index 219f96f2aaaf..3591a2791c1a 100644 --- a/drivers/pnp/isapnp/core.c +++ b/drivers/pnp/isapnp/core.c @@ -853,7 +853,9 @@ static int isapnp_get_resources(struct pnp_dev *dev) pnp_dbg(&dev->dev, "get resources\n"); pnp_init_resources(dev); - isapnp_cfg_begin(dev->card->number, dev->number); + ret = isapnp_cfg_begin(dev->card->number, dev->number); + if (ret) + return ret; dev->active = isapnp_read_byte(ISAPNP_CFG_ACTIVATE); if (!dev->active) goto __end; @@ -887,10 +889,12 @@ __end: static int isapnp_set_resources(struct pnp_dev *dev) { struct resource *res; - int tmp; + int tmp, ret; pnp_dbg(&dev->dev, "set resources\n"); - isapnp_cfg_begin(dev->card->number, dev->number); + ret = isapnp_cfg_begin(dev->card->number, dev->number); + if (ret) + return ret; dev->active = 1; for (tmp = 0; tmp < ISAPNP_MAX_PORT; tmp++) { res = pnp_get_resource(dev, IORESOURCE_IO, tmp); @@ -936,9 +940,13 @@ static int isapnp_set_resources(struct pnp_dev *dev) static int isapnp_disable_resources(struct pnp_dev *dev) { + int ret; + if (!dev->active) return -EINVAL; - isapnp_cfg_begin(dev->card->number, dev->number); + ret = isapnp_cfg_begin(dev->card->number, dev->number); + if (ret) + return ret; isapnp_deactivate(dev->number); dev->active = 0; isapnp_cfg_end(); diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c index c1f6e6bd0eb2..b3abab24050b 100644 --- a/drivers/pnp/isapnp/proc.c +++ b/drivers/pnp/isapnp/proc.c @@ -25,6 +25,7 @@ static ssize_t isapnp_proc_bus_read(struct file *file, char __user * buf, struct pnp_dev *dev = pde_data(file_inode(file)); int pos = *ppos; int cnt, size = 256; + int ret; if (pos >= size) return 0; @@ -37,7 +38,9 @@ static ssize_t isapnp_proc_bus_read(struct file *file, char __user * buf, if (!access_ok(buf, cnt)) return -EINVAL; - isapnp_cfg_begin(dev->card->number, dev->number); + ret = isapnp_cfg_begin(dev->card->number, dev->number); + if (ret) + return ret; for (; pos < 256 && cnt > 0; pos++, buf++, cnt--) { unsigned char val; val = isapnp_read_byte(pos); diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index 3cadbf7cf238..de1eda5a0656 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c @@ -1950,7 +1950,11 @@ static int snd_audiodrive_pnp_init_main(int dev, struct pnp_dev *pdev) /* ok. hack using Vendor-Defined Card-Level registers */ /* skip csn and logdev initialization - already done in isapnp_configure */ if (pnp_device_is_isapnp(pdev)) { - isapnp_cfg_begin(isapnp_card_number(pdev), isapnp_csn_number(pdev)); + int ret = isapnp_cfg_begin(isapnp_card_number(pdev), + isapnp_csn_number(pdev)); + + if (ret) + return ret; isapnp_write_byte(0x27, pnp_irq(pdev, 0)); /* Hardware Volume IRQ Number */ if (mpu_port[dev] != SNDRV_AUTO_PORT) isapnp_write_byte(0x28, pnp_irq(pdev, 0)); /* MPU-401 IRQ Number */ -- 2.53.0