From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D489114288 for ; Fri, 5 Apr 2024 07:14:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712301256; cv=none; b=cT6lfAfIy6goQBAOANLDPm/MRngBOxJ02sau+5DIRkuYtC8BVzbsRFj0C3Z8C2h7LtpbWhe7qWMOrlOwV/BFCEhai3Dv1FMYZdT3e8zhyeuOM4Zb1x0yz85ILlmE7U6DLziFF5Y9buwCySmqMI2hL4aB62gs7ESAyp7Ev9QIyjo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712301256; c=relaxed/simple; bh=TP+sUlRXddkFknDRlXUeYIavOqWtHhc81OAfU6Lizsw=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=sCBepNPnulJp7c5OBG4lSl4tCBsOIARa7Qg1iOgB5ulGADkxF9j0UWnhnyIVHa98frY859XRz0rQ7sbt9ZShCE42Iu8kdWXObQaF8Q4kJskqpo5siugzic59PRfskub/hqQYDkSmGEvXRRRCBVjkgBt9Xsy+rFPevisSwVDwlkw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0C9BNDmq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="0C9BNDmq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D5A1C433C7; Fri, 5 Apr 2024 07:14:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712301255; bh=TP+sUlRXddkFknDRlXUeYIavOqWtHhc81OAfU6Lizsw=; h=Subject:To:Cc:From:Date:From; b=0C9BNDmqQ2LdsW7/DYDEhSo9i+bBo675Tj25vA0512u8Mo6sYu3tcj5Y99MzV/2jC qnYOTiqx7aiSJdtBF5l9bS5nd0RXGuxRyBIu9yKsAtxWVdbKJ42fTzRG7m0GVmrZzp mCs29sdpP+I7HEaMm6djBQFLSVFRLKeplAEzRodQ= Subject: FAILED: patch "[PATCH] selinux: avoid dereference of garbage after mount failure" failed to apply to 6.1-stable tree To: cgzones@googlemail.com,paul@paul-moore.com Cc: From: Date: Fri, 05 Apr 2024 09:14:04 +0200 Message-ID: <2024040504-outpost-unbiased-0f9b@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 37801a36b4d68892ce807264f784d818f8d0d39b # git commit -s git send-email --to '' --in-reply-to '2024040504-outpost-unbiased-0f9b@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 37801a36b4d6 ("selinux: avoid dereference of garbage after mount failure") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 37801a36b4d68892ce807264f784d818f8d0d39b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= Date: Thu, 28 Mar 2024 20:16:58 +0100 Subject: [PATCH] selinux: avoid dereference of garbage after mount failure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In case kern_mount() fails and returns an error pointer return in the error branch instead of continuing and dereferencing the error pointer. While on it drop the never read static variable selinuxfs_mount. Cc: stable@vger.kernel.org Fixes: 0619f0f5e36f ("selinux: wrap selinuxfs state") Signed-off-by: Christian Göttsche Signed-off-by: Paul Moore diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index 0619a1cbbfbe..074d6c2714eb 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -2123,7 +2123,6 @@ static struct file_system_type sel_fs_type = { .kill_sb = sel_kill_sb, }; -static struct vfsmount *selinuxfs_mount __ro_after_init; struct path selinux_null __ro_after_init; static int __init init_sel_fs(void) @@ -2145,18 +2144,21 @@ static int __init init_sel_fs(void) return err; } - selinux_null.mnt = selinuxfs_mount = kern_mount(&sel_fs_type); - if (IS_ERR(selinuxfs_mount)) { + selinux_null.mnt = kern_mount(&sel_fs_type); + if (IS_ERR(selinux_null.mnt)) { pr_err("selinuxfs: could not mount!\n"); - err = PTR_ERR(selinuxfs_mount); - selinuxfs_mount = NULL; + err = PTR_ERR(selinux_null.mnt); + selinux_null.mnt = NULL; + return err; } + selinux_null.dentry = d_hash_and_lookup(selinux_null.mnt->mnt_root, &null_name); if (IS_ERR(selinux_null.dentry)) { pr_err("selinuxfs: could not lookup null!\n"); err = PTR_ERR(selinux_null.dentry); selinux_null.dentry = NULL; + return err; } return err;