From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 244FC365A1A; Sat, 12 Sep 2026 18:30:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789237812; cv=none; b=AwIR2zb1pY4tpoXug9cK9ir/I/OxFmuRJZQWcATLIgCOF6UoZIYCQbqpIYFyuEg1KSlymLRLImZhRWbl5yHfQ03mIBM+kPLzGZ1CvYdE+L+t2Oaa3Yjl0SIJ0NPa+V92dZG5mtahHgLoU4ZHQ5RarU7ZLSpex+7sZFUgbAzNP+A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789237812; c=relaxed/simple; bh=Pf7Byz7UvsQyrrgTNB1BoG4duxhZjoUJXxqv9LPgD3E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lzVxGLyaYOtKGRZVAZAv17EvcgOKuQz5XL2ywWAQYdgkBD+spx4iI2HnOvc2kqaMf05eaS1NDAoq/kOs3FuhohOjx6sQmGR1Ad8xiFYKlDOrN1n7ik+Te3tGuv24Kvr+eboOFOlXV5/19l3hHkwgwDL5wH6A2PIb1oYq3FHuYKk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hfRxWHX+; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hfRxWHX+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EDE751F000FF; Sat, 12 Sep 2026 18:30:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789237811; bh=FXMi5cpTzzj2QslMFGY37bYN0FXDubeBMFPtWaVQ6ZU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hfRxWHX+8hapa8WpbQmPeLrphb6dfNiuGxBmgDJLAWxQqmigjSq3wfLnVDxyslCb0 +w3FQft2QPk0pZBuiApbEEXGgcMRxDMIOO8gcJ0WJrYE8/eKhMmQVG6Rq6TQYqNBkR P0So5oGpQUPGEmugE5iIo/fLVzCVWUqatB4BKMTM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christian Borntraeger , Claudio Imbrenda Subject: [PATCH 5.15 307/935] KVM: s390: Restore sigset on error path Date: Sat, 12 Sep 2026 08:55:37 +0200 Message-ID: <20260912065533.847618143@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065526.833703348@linuxfoundation.org> References: <20260912065526.833703348@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christian Borntraeger commit c44d36d8e6501c4934412d9014e5e02da9efdb8f upstream. kvm_sigset_activate() installs vcpu->sigset via sigprocmask() and stashes the caller's mask in current->real_blocked; only kvm_sigset_deactivate() restores it. For KVM_RUN on a STOPPED vcpu the error path will not restore the userspace mask. Re-arrange the error handling to also restore the signal mask. Fixes: 6352e4d2dd9a3 ("KVM: s390: implement KVM_(S|G)ET_MP_STATE for user space state control") Cc: stable@vger.kernel.org Signed-off-by: Christian Borntraeger Reviewed-by: Claudio Imbrenda Signed-off-by: Claudio Imbrenda Message-ID: <20260811153738.206885-5-borntraeger@linux.ibm.com> Signed-off-by: Greg Kroah-Hartman --- arch/s390/kvm/kvm-s390.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -4456,7 +4456,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_v pr_err_ratelimited("can't run stopped vcpu %d\n", vcpu->vcpu_id); rc = -EINVAL; - goto out; + goto out_sigset; } sync_regs(vcpu); @@ -4483,9 +4483,11 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_v disable_cpu_timer_accounting(vcpu); store_regs(vcpu); + vcpu->stat.exit_userspace++; + +out_sigset: kvm_sigset_deactivate(vcpu); - vcpu->stat.exit_userspace++; out: vcpu_put(vcpu); return rc;