From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E44D1CA40; Tue, 16 Jul 2024 15:36:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721144163; cv=none; b=YCnlc5DS1e5FTQN84f/jMarA6h4IPkW0iOcqaYyyJvdkGF/fyn6gixVsh5tSg2DNiDxSjKSDTK+HcWdNGmm3LLwiVV4VyCCXTkgm9Gzni4GwN3OFNxxynKmAr1o877gPvnopiRKzLQCHQs3hUW3NaGMEUp3B9vFkpCCZHFeVuJw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721144163; c=relaxed/simple; bh=yCTYfc8U5WwmOgxju+mh3I5dNhV9X05KGh/OpjLQmao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Acpgl4kmgselVrCI6rWv+Pazs3reSyvcAt3pTvb7AwlSpJvaT5R/4OBTrVYXIqLxtvnob1cuxBkKlK3nL8CNZc2D6bNBWiG0ccOLG1e38nTdGLYp8fuWfm8TMbaoKlzbcJDuVs6AMR5YfeuF3T4nxYsbYBLqzF1i5NvXwoHZsrw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=izOYOz8W; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="izOYOz8W" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 689D2C116B1; Tue, 16 Jul 2024 15:36:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721144162; bh=yCTYfc8U5WwmOgxju+mh3I5dNhV9X05KGh/OpjLQmao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=izOYOz8W1otjH/HOXvIZ8q6m2Oua95LpHrlzHBg/o8eAhqmvKpJr3G0baRFFM2E/m 1koNn2FGYIrvGnWki2Kqw1Mt8n6b8C/D8s8pKoZ5Pvo4fdskREyxuTTcNbT4Z8zNSi 1yEhkcdA/KJW7QvNRVVmPST70JGkH2Huvv5PRB9o= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Heiko Carstens , Harald Freudenberger , Ingo Franzki , Holger Dengler , Alexander Gordeev , Sasha Levin Subject: [PATCH 4.19 18/66] s390/pkey: Wipe sensitive data on failure Date: Tue, 16 Jul 2024 17:30:53 +0200 Message-ID: <20240716152738.857835019@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240716152738.161055634@linuxfoundation.org> References: <20240716152738.161055634@linuxfoundation.org> User-Agent: quilt/0.67 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 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Holger Dengler [ Upstream commit 1d8c270de5eb74245d72325d285894a577a945d9 ] Wipe sensitive data from stack also if the copy_to_user() fails. Suggested-by: Heiko Carstens Reviewed-by: Harald Freudenberger Reviewed-by: Ingo Franzki Acked-by: Heiko Carstens Signed-off-by: Holger Dengler Signed-off-by: Alexander Gordeev Signed-off-by: Sasha Levin --- drivers/s390/crypto/pkey_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/s390/crypto/pkey_api.c b/drivers/s390/crypto/pkey_api.c index b16344479959b..fa97e666f19e6 100644 --- a/drivers/s390/crypto/pkey_api.c +++ b/drivers/s390/crypto/pkey_api.c @@ -1089,7 +1089,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd, if (rc) break; if (copy_to_user(ucs, &kcs, sizeof(kcs))) - return -EFAULT; + rc = -EFAULT; memzero_explicit(&kcs, sizeof(kcs)); break; } @@ -1120,7 +1120,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd, if (rc) break; if (copy_to_user(ucp, &kcp, sizeof(kcp))) - return -EFAULT; + rc = -EFAULT; memzero_explicit(&kcp, sizeof(kcp)); break; } -- 2.43.0