From nobody Sun Feb 8 14:10:28 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 ED5F03A9616 for ; Tue, 20 Jan 2026 20:13:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768939984; cv=none; b=J7HuH2N9HTqw4wZRikBVUnIq92JjiU6OcipCElaiNxy9uTVnhChxg1cgn9eX6eDTSUzdbjBAEqncGzQhD2HZyXUsK2jCOu98IyvJu8LFYYm3FmzLfZQCPbCxZC3zLU9yzqKMa2ytMUS74lya+mse3wVYnqIwANIqjOnj+UOUctQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768939984; c=relaxed/simple; bh=M+klrKG7t6pUf/GO4ORX5lUzkHkLnHeEVL/FJGabe+s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dXEDG/EtcpugTbeRCTFL959l2zGIwPkA2AbLa0I7m8Q0jYySvo36jaJR9wdzRWJjaaZ0/SipUNBPfJbQniz/Derlx805hFGqFu9lB+WxXadlV9gfeDMMmK9TVVjtryb6zq7m17TNJjtu6eQsCBPqewsc7Jbsu+VUIBmE4H+7mw0= 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=XI1myI03; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=ax/outQG; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=XI1myI03; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=ax/outQG; arc=none smtp.client-ip=195.135.223.130 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="XI1myI03"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="ax/outQG"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="XI1myI03"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="ax/outQG" 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-out1.suse.de (Postfix) with ESMTPS id 639E1336B7; Tue, 20 Jan 2026 20:12:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1768939979; 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=C6LsTZnO3E2g9e664OS7z1GS6NXqdu2qUpw+E2fuKwA=; b=XI1myI031B5QFIfaILYmYTP9qrAsMk4UIIuC5mPtyG/PH19b5qAK23LF4/7uDPmEXWphII VNyxGtsq7Vq64ps0friXTyoI59xpxVEkYKcWIfEwzoC1qoUgqpcQPm4vWtl3Jcvy+NRebH Rk41W+t9r9D4VpvRC/AWLwJ5Tlj2eDU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1768939979; 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=C6LsTZnO3E2g9e664OS7z1GS6NXqdu2qUpw+E2fuKwA=; b=ax/outQGqaK4uRnMTfLgfXR5sOFO0X8VhFRb7NceA11m8HI9acnxRP9JWUr+ezMDndt6Be sU7IYZPfZGc3dxDQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1768939979; 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=C6LsTZnO3E2g9e664OS7z1GS6NXqdu2qUpw+E2fuKwA=; b=XI1myI031B5QFIfaILYmYTP9qrAsMk4UIIuC5mPtyG/PH19b5qAK23LF4/7uDPmEXWphII VNyxGtsq7Vq64ps0friXTyoI59xpxVEkYKcWIfEwzoC1qoUgqpcQPm4vWtl3Jcvy+NRebH Rk41W+t9r9D4VpvRC/AWLwJ5Tlj2eDU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1768939979; 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=C6LsTZnO3E2g9e664OS7z1GS6NXqdu2qUpw+E2fuKwA=; b=ax/outQGqaK4uRnMTfLgfXR5sOFO0X8VhFRb7NceA11m8HI9acnxRP9JWUr+ezMDndt6Be sU7IYZPfZGc3dxDQ== 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 854163EA63; Tue, 20 Jan 2026 20:12:58 +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 KB1NHcrhb2nRMAAAD6G6ig (envelope-from ); Tue, 20 Jan 2026 20:12:58 +0000 From: =?UTF-8?q?Carlos=20L=C3=B3pez?= To: kvm@vger.kernel.org, seanjc@google.com, pbonzini@redhat.com Cc: pankaj.gupta@amd.com, tglx@linutronix.de, mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, =?UTF-8?q?Carlos=20L=C3=B3pez?= , Borislav Petkov Subject: [PATCH v2 2/6] KVM: SEV: use mutex guard in sev_mem_enc_ioctl() Date: Tue, 20 Jan 2026 21:10:10 +0100 Message-ID: <20260120201013.3931334-5-clopez@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260120201013.3931334-3-clopez@suse.de> References: <20260120201013.3931334-3-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.30 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_TWELVE(0.00)[12]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; 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] X-Spam-Flag: NO X-Spam-Score: -3.30 X-Spam-Level: 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 --- 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 59a0ad3e0917..bede01fc9086 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2574,30 +2574,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); @@ -2666,15 +2660,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