Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <4278ae8b-eb87-06ac-43af-41a1c741f9a9@amd.com>
Date:   Mon, 11 Apr 2022 13:58:00 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.7.0
Subject: Re: [PATCH] crypto: ccp - Fix the INIT_EX data file open failure
Content-Language: en-US
To:     Jacky Li <jackyli@google.com>,
        Brijesh Singh <brijesh.singh@amd.com>,
        John Allen <john.allen@amd.com>
Cc:     Herbert Xu <herbert@gondor.apana.org.au>,
        "David S. Miller" <davem@davemloft.net>,
        Marc Orr <marcorr@google.com>, Alper Gun <alpergun@google.com>,
        Peter Gonda <pgonda@google.com>, linux-crypto@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <20220411180006.4187548-1-jackyli@google.com>
From:   Tom Lendacky <thomas.lendacky@amd.com>
In-Reply-To: <20220411180006.4187548-1-jackyli@google.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UkdoNS9sOWlNcnU1MHF6OTcraWFjemRMaDNXT1lkVXp4K0oybDliUjc0TVcv?=
 =?utf-8?B?QW8wVlA3ZFRsQVZmc0hxL3FOb0dzc2l6R1ZvaitrZkVnOGxtY2t1WmpqWDBJ?=
 =?utf-8?B?di9LcDFSVGQxbXFuK0FiNldkMk94aWpHSDlWSzBDWjM5TU9OWU43bXdqUmpr?=
 =?utf-8?B?YmR5SEFGNEJ0YnJNcElOWVhjdUJTTm5DcmFiQklNQkZpUXhRQVZwNVNTU2V1?=
 =?utf-8?B?RzB2UDB0MFgvbFJ5UHRMRGFTOHRmRGJJZ1hVejVrSnN2U21rZzJ3MXlqa0Mr?=
 =?utf-8?B?K3ZLQU54bXNTc2hWQitjbnBXa1piRmNrSytHUUhGUTZaL05jV0J6NWl5eVVp?=
 =?utf-8?B?YjVHTDRDOC8rRXFRSFd6dVlFZzdOaEM0M2gyWC9WT0xxUXdPS2dVVDBZSE5V?=
 =?utf-8?B?T0JxTXNMYWozRTZvSUtyUzFwWXVsWC9LK2JoaGxUV1VCbnJrYlVqbkIzbzRO?=
 =?utf-8?B?RGMwYTAyK3B2NE5CdlhEQTFFM3dEa0ZGckRxaWlmTFdIRm5UN0U0WmJQSWta?=
 =?utf-8?B?eWlRS21QQlZ1VENpaUtmQ3lNSnFUb01XTEJDdm42b24vU0QzMmVLL3ZmRnla?=
 =?utf-8?B?c2k1WllrSi9veTF1dFpDemlMT1l2bzE4dUg5N2IrcjBNbndLVG5rc1NHM21C?=
 =?utf-8?B?UTJSZSs3NVRhYStxNlVnL2xkMmkxdzBwTFRiOTYxRG1ETW9lOWhyOTZFS0FJ?=
 =?utf-8?B?L0NqV3VQTU96RUpFS2FuYTJabmhRMXRZRGVMQ0dMTVp0R0JGQkgybnNqM21u?=
 =?utf-8?B?eE51NVYrQXVXRjE5OUFJeWw1RG44L0FpRTJJdjZsNG5PY0tNUzBQcDhOMDRL?=
 =?utf-8?B?SG1oZEY3aVRWN2ZrSEJnWnVyVDBEUm1XbkFYS2tiMzFLWWlUTUZaczVjRm0r?=
 =?utf-8?B?eGppdmNvS01DNDYwdFZFV09WaGlNaTVSNFBOdzkwZHFSRjhsd29sWndxWndm?=
 =?utf-8?B?ekk3M2FnZnJ3Vmx5bmJhRHYySXErMFBuVGJOZWl3QzFLU0Ixc1NqSzh6Szhh?=
 =?utf-8?B?MUpaRzlnc3RkYnJHOXNQTWpudFlYQ0RQeTV0Y1ZRaVFzTzBpOXMzSnJQdVVn?=
 =?utf-8?B?aHI0YUJ2MVMzUXpoRkw4bkxPZmJDUVpULzdtTm03ZVdBK095WXgrR0RZWHJp?=
 =?utf-8?B?MHZxMTA4ZDN5NFA3K05qQjBpYnhaZmUzQXYzZk4wWHZGQ2pBajN0U2xzS3F6?=
 =?utf-8?B?NitrVStwdDBFNVV6djNmK1pPYXdiT1lXSndsY2VzUEJZS05SOGZBVTlKVzF4?=
 =?utf-8?B?amgyc1NQbER2d1Q4MVdSQWlLQ2lEVDNrWlhCd2ROVUd4aE5PWk1oaVdzczNN?=
 =?utf-8?B?TTFGanpENWhMallnV1FhSWpudE9NTURaRjBJZ0lYVTFhVHVSdm10L25BRkFW?=
 =?utf-8?B?bW16dkI1SnF2bHZ0Rno2TFZzUDNHdGxHU3hvRFhLa294N2hvdlJxZW5mczlr?=
 =?utf-8?B?SHlKemt3c2R6NUo0MVBVUTg2cFE4aFE3aUlYUFkrblpOb3F4dEwzNlFZOVp1?=
 =?utf-8?B?dkdEd2xONHhiaU9LMDJjYkxJNXhDTWE2S2tqanVQWjJOR0w1eHR6MERaVk9n?=
 =?utf-8?B?UmhzaFpodFBUZ0dzMDNmeTAyVDBQWWpabGJXT3RLdnJiYjhjY2dQSGZTUFpI?=
 =?utf-8?B?YUhyYSthY1QwTVpiYzlsS2NEKzlweEF4Ry9mbHdYM1BNRU9PajBaNU5obVhY?=
 =?utf-8?B?RGo2UnJlcU5XQXVYRzB3bklKRDNuOHhmU3RXV05PS2xmQ3Y1Wmp2SDd5dUdn?=
 =?utf-8?B?STZrTlZhOTdpRTcxN3NPcVhrdm1IQWxDSElaNUpGdlEzMmZ3VHNhb1JRUnBS?=
 =?utf-8?B?a3dZMDFxa0lsMXRnZjNPZEdsM25FWnZDSkdJK056QWl5SHoycjhXcTNvZXJs?=
 =?utf-8?B?Zitwc0w0Z1JXUUlHbURMbzc0cXErRk53YmdwcHkyc3FoSU1zaWJDMy9oUzZS?=
 =?utf-8?B?UWRUckl3V2hEYUxmWjQ4blIzazR5cS9xOTFMQWljUGlHNGNIR29lUlp3SzFl?=
 =?utf-8?B?MlMrZU1DOTZYWG5rcldQa2NVYm53M1EwOHhOTm82UXhxSkFUaS9pSFdkalhK?=
 =?utf-8?B?K2RNVW9ZazdjZGxLcEdSWFFUNTJzelcxc2tyMWpzS3kxdk04NVR5aVdKbHdY?=
 =?utf-8?B?SlFWaDhXV090Nk5DZXFiWFh3b09XZmxHTWRlbHo5WHhSKytpb3UxRDNCS3BZ?=
 =?utf-8?B?a2RNazVQampNUjkxbDJLMCtoQVV2TnhCY1FRYUxIMTEzNEhhZVl0RmdRblli?=
 =?utf-8?B?cFZ2QWEyQ05rak9UbUxxTlBKVVFGSjhreFU0QVIzd0Z6ZjZuVVBYYkdMb05L?=
 =?utf-8?B?cnRhQWRxKzBCbk43ZVJsb3VBUjdhSWdYWUpmOGhjcENoK3I1Vk9JZz09?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 43672e3a-692f-4848-9f92-08da1bed347a
X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB5229.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2022 18:58:02.9714
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: oaXIE0Aiw29Aeyk99cxi7d4CHrbwCKONayfXb3o4oiqnCLrKkQwctgSp3FXz4Dv415/PU25a+jGjnlieYUCsVQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2488
X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

On 4/11/22 13:00, Jacky Li wrote:
> There are 2 common cases when INIT_EX data file might not be
> opened successfully and fail the sev initialization:
> 
> 1. In user namespaces, normal user tasks (e.g. VMM) can change their
>     current->fs->root to point to arbitrary directories. While
>     init_ex_path is provided as a module param related to root file
>     system. Solution: use the root directory of init_task to avoid
>     accessing the wrong file.
> 
> 2. Normal user tasks (e.g. VMM) don't have the privilege to access
>     the INIT_EX data file. Solution: open the file as root and
>     restore permissions immediately.
> 
> Signed-off-by: Jacky Li <jackyli@google.com>

Should this have a Fixes: tag?

Thanks,
Tom

> ---
>   drivers/crypto/ccp/sev-dev.c | 30 ++++++++++++++++++++++++++++--
>   1 file changed, 28 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
> index 6ab93dfd478a..3aefb177715e 100644
> --- a/drivers/crypto/ccp/sev-dev.c
> +++ b/drivers/crypto/ccp/sev-dev.c
> @@ -23,6 +23,7 @@
>   #include <linux/gfp.h>
>   #include <linux/cpufeature.h>
>   #include <linux/fs.h>
> +#include <linux/fs_struct.h>
>   
>   #include <asm/smp.h>
>   
> @@ -170,6 +171,31 @@ static void *sev_fw_alloc(unsigned long len)
>   	return page_address(page);
>   }
>   
> +static struct file *open_file_as_root(const char *filename, int flags, umode_t mode)
> +{
> +	struct file *fp;
> +	struct path root;
> +	struct cred *cred;
> +	const struct cred *old_cred;
> +
> +	task_lock(&init_task);
> +	get_fs_root(init_task.fs, &root);
> +	task_unlock(&init_task);
> +
> +	cred = prepare_creds();
> +	if (!cred)
> +		return ERR_PTR(-ENOMEM);
> +	cred->fsuid = GLOBAL_ROOT_UID;
> +	old_cred = override_creds(cred);
> +
> +	fp = file_open_root(&root, filename, flags, mode);
> +	path_put(&root);
> +
> +	revert_creds(old_cred);
> +
> +	return fp;
> +}
> +
>   static int sev_read_init_ex_file(void)
>   {
>   	struct sev_device *sev = psp_master->sev_data;
> @@ -181,7 +207,7 @@ static int sev_read_init_ex_file(void)
>   	if (!sev_init_ex_buffer)
>   		return -EOPNOTSUPP;
>   
> -	fp = filp_open(init_ex_path, O_RDONLY, 0);
> +	fp = open_file_as_root(init_ex_path, O_RDONLY, 0);
>   	if (IS_ERR(fp)) {
>   		int ret = PTR_ERR(fp);
>   
> @@ -217,7 +243,7 @@ static void sev_write_init_ex_file(void)
>   	if (!sev_init_ex_buffer)
>   		return;
>   
> -	fp = filp_open(init_ex_path, O_CREAT | O_WRONLY, 0600);
> +	fp = open_file_as_root(init_ex_path, O_CREAT | O_WRONLY, 0600);
>   	if (IS_ERR(fp)) {
>   		dev_err(sev->dev,
>   			"SEV: could not open file for write, error %ld\n",