From nobody Mon Feb 9 05:59:23 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC45231A802 for ; Fri, 19 Dec 2025 11:43:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766144624; cv=none; b=q6v0MeGc3eBYRxqT2ueVRz14aAj/7r3PhEtcIKcluJ5fV7II9WUlU0My6lC6HW9jwMA9CJ7wyqCqc0IzBoInQ6GJ0CG5ZMiA7Oo945Mh70DrYWXHC7SvzyMiX6QYUkILvylxSyy2Q8uVAAiO4o58P9kPW3P2/In+u1pwoLNgsfY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766144624; c=relaxed/simple; bh=WT+AweqE2BkW0lbQLjFvfZBROAT0sQXjWX6h2baii5A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HXARTZ9JmaQgv6+9/vNZaIDpg1UkIeQoIgqJO72fzYeWOG/KZ/4eI/3doIjv8KQbHW6fyOXmg8MmsC1TvNtK6NfGuqiYPLzOqF5OXSFQNy9du8eEA8aclpHmXzYsHTu1+rnk5caFo95dbnwJUs9wz+utBmnOJEEGQXCcrRbYAh8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=LYRSNgcf; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=c4UYOcss; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=fG5CggXi; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=9EYX1+lm; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="LYRSNgcf"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="c4UYOcss"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="fG5CggXi"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="9EYX1+lm" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id EAF875BD33; Fri, 19 Dec 2025 11:43:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1766144620; h=from:from:reply-to: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; bh=5oSZZT48jCa2l0/DziD5ficyj8DE33K7X9MsZAk4m/A=; b=LYRSNgcfbQM8UXqrL8N5JA9GcPz/SR0pRzmqrXO+gmbIcOWBTjwZdDdD92HGvTv/ItjJjJ lAzRnUxBAGBE7Ujh5/wSTF0Qrso+eFcaVPWb6p0rY3mSWM2wBftVzKUmouvXnnDJ4Bd/5M U1+5LouATv7hsa0OeLGuZGV5JeGNvCA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1766144620; h=from:from:reply-to: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; bh=5oSZZT48jCa2l0/DziD5ficyj8DE33K7X9MsZAk4m/A=; b=c4UYOcss3t+vJorOAV9OlUSaX3kPqvXlCAvmlT+eS7bk4OTKXJhF8sUZ20HH+fAeeznlRD 8IlQNNQ0M4EmuaBA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1766144619; h=from:from:reply-to: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; bh=5oSZZT48jCa2l0/DziD5ficyj8DE33K7X9MsZAk4m/A=; b=fG5CggXi+aW9NMAZqGfLrZ1N494WAmjRTmFVS1Bp3zH+faWy0Z5xP1uOM4EcIjXy6y6YTZ 1cyeJjWw1OMLGZtcgvZOcpjNJPxczEpdKRh0kJ861eAhmfE5ct3jgdzrcDLzM97ozaKzcY duXZyfpRfJFMakTSCp2D0nSVmFKfq/I= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1766144619; h=from:from:reply-to: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; bh=5oSZZT48jCa2l0/DziD5ficyj8DE33K7X9MsZAk4m/A=; b=9EYX1+lmjcPOVVzOxv+QZnDx1zsAu4Eh73G5Y6kFz0saMPpCjbX9DR8CFlFHN2ixO5SCGR fjzkS6PYdHykieAg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 553913EA66; Fri, 19 Dec 2025 11:43:39 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id SIIjEms6RWnWGgAAD6G6ig (envelope-from ); Fri, 19 Dec 2025 11:43:39 +0000 From: =?UTF-8?q?Carlos=20L=C3=B3pez?= To: kvm@vger.kernel.org, seanjc@google.com, pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, =?UTF-8?q?Carlos=20L=C3=B3pez?= Subject: [PATCH 2/6] KVM: SEV: use mutex guard in sev_mem_enc_ioctl() Date: Fri, 19 Dec 2025 12:41:57 +0100 Message-ID: <20251219114238.3797364-3-clopez@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251219114238.3797364-1-clopez@suse.de> References: <20251219114238.3797364-1-clopez@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-3.29 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.19)[-0.955]; MIME_GOOD(-0.10)[text/plain]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RCPT_COUNT_SEVEN(0.00)[11]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo,sev_cmd.id:url] X-Spam-Level: X-Spam-Flag: NO X-Spam-Score: -3.29 Simplify the error paths in sev_mem_enc_ioctl() by using a mutex guard, allowing early return instead of using gotos. Signed-off-by: Carlos L=C3=B3pez Reviewed-by: Pankaj Gupta --- arch/x86/kvm/svm/sev.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 1b325ae61d15..0ee1b77aeec5 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2575,30 +2575,24 @@ int sev_mem_enc_ioctl(struct kvm *kvm, void __user = *argp) if (copy_from_user(&sev_cmd, argp, sizeof(struct kvm_sev_cmd))) return -EFAULT; =20 - mutex_lock(&kvm->lock); + guard(mutex)(&kvm->lock); =20 /* Only the enc_context_owner handles some memory enc operations. */ if (is_mirroring_enc_context(kvm) && - !is_cmd_allowed_from_mirror(sev_cmd.id)) { - r =3D -EINVAL; - goto out; - } + !is_cmd_allowed_from_mirror(sev_cmd.id)) + return -EINVAL; =20 /* * Once KVM_SEV_INIT2 initializes a KVM instance as an SNP guest, only * allow the use of SNP-specific commands. */ - if (sev_snp_guest(kvm) && sev_cmd.id < KVM_SEV_SNP_LAUNCH_START) { - r =3D -EPERM; - goto out; - } + if (sev_snp_guest(kvm) && sev_cmd.id < KVM_SEV_SNP_LAUNCH_START) + return -EPERM; =20 switch (sev_cmd.id) { case KVM_SEV_ES_INIT: - if (!sev_es_enabled) { - r =3D -ENOTTY; - goto out; - } + if (!sev_es_enabled) + return -ENOTTY; fallthrough; case KVM_SEV_INIT: r =3D sev_guest_init(kvm, &sev_cmd); @@ -2667,15 +2661,12 @@ int sev_mem_enc_ioctl(struct kvm *kvm, void __user = *argp) r =3D snp_launch_finish(kvm, &sev_cmd); break; default: - r =3D -EINVAL; - goto out; + return -EINVAL; } =20 if (copy_to_user(argp, &sev_cmd, sizeof(struct kvm_sev_cmd))) r =3D -EFAULT; =20 -out: - mutex_unlock(&kvm->lock); return r; } =20 --=20 2.51.0