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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69EE7C433FE for ; Wed, 23 Nov 2022 09:40:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237983AbiKWJkI (ORCPT ); Wed, 23 Nov 2022 04:40:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237968AbiKWJjn (ORCPT ); Wed, 23 Nov 2022 04:39:43 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE571115D2F for ; Wed, 23 Nov 2022 01:37:25 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A03C2B81E60 for ; Wed, 23 Nov 2022 09:37:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7400C433D6; Wed, 23 Nov 2022 09:37:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1669196243; bh=Fa+gp3YAFWfW2Pn/Z0t9Ktc4n8DlAlMa0GeSt3EBJyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uf+uGzhfiXWxse/ez6LYCLINE0/6jdk8KC3kwn1Cc3ELQH29CLayaszA22TieIrz5 Xl3j9jdoN0QDGMphOd+TIZirKaUnYuCU+yljInS0/ERVmQWxraxvcbviyZGaSIJauq B3KqEz3EMv8Rzu8y3SnVKOCP9eq9kzBmqYP8+M3I= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Keith Busch , Christoph Hellwig , Ovidiu Panait Subject: [PATCH 5.15 157/181] nvme: restrict management ioctls to admin Date: Wed, 23 Nov 2022 09:52:00 +0100 Message-Id: <20221123084609.127437578@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221123084602.707860461@linuxfoundation.org> References: <20221123084602.707860461@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Keith Busch commit 23e085b2dead13b51fe86d27069895b740f749c0 upstream. The passthrough commands already have this restriction, but the other operations do not. Require the same capabilities for all users as all of these operations, which include resets and rescans, can be disruptive. Signed-off-by: Keith Busch Signed-off-by: Christoph Hellwig Signed-off-by: Ovidiu Panait Signed-off-by: Greg Kroah-Hartman --- drivers/nvme/host/ioctl.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/nvme/host/ioctl.c +++ b/drivers/nvme/host/ioctl.c @@ -484,11 +484,17 @@ long nvme_dev_ioctl(struct file *file, u case NVME_IOCTL_IO_CMD: return nvme_dev_user_cmd(ctrl, argp); case NVME_IOCTL_RESET: + if (!capable(CAP_SYS_ADMIN)) + return -EACCES; dev_warn(ctrl->device, "resetting controller\n"); return nvme_reset_ctrl_sync(ctrl); case NVME_IOCTL_SUBSYS_RESET: + if (!capable(CAP_SYS_ADMIN)) + return -EACCES; return nvme_reset_subsystem(ctrl); case NVME_IOCTL_RESCAN: + if (!capable(CAP_SYS_ADMIN)) + return -EACCES; nvme_queue_scan(ctrl); return 0; default: