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 4C717156238; Tue, 9 Jul 2024 11:21:50 +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=1720524110; cv=none; b=nId6tNq2bvsiQkDrHVIf2nxZXsonh1Z9XcWxgaRsiAbzjceeK+wOksqYF4EO8GmYu79tbhBIWkEIYGA1Uxe+/K2seIa4Lc7IiT5yvIS3Zm5ADJ73/9Oz7MyC25V1ba2lcd3v7SN+kDdWe22ts0jpcTf5KPhO/WWwc5UqmM9XjSU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720524110; c=relaxed/simple; bh=jetjh8ZienpUbp7qV/o2j/FfL6lX+gBAUwg05jb+l8U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g+NgzNywWHdNUgGda2VPLIPYjnBWj19Kpfw+/7NEsy1KyWj2+u561EPcSdd4qUQC+DUMmN2d+Rz7hGxpEfOPK4LG5nZQn0SUH7JRE67IjotKLW4RqxJiSgP/lWnvau04iYGGIhJVaTIqhjoAxNtk2dtNeYyx7P+8Oisha4BW4Og= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ONJ0Q9Q4; 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="ONJ0Q9Q4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5937C3277B; Tue, 9 Jul 2024 11:21:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1720524110; bh=jetjh8ZienpUbp7qV/o2j/FfL6lX+gBAUwg05jb+l8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ONJ0Q9Q43pFHBQVhN8OxwNcAcLssxNFg0hDGYm6XIGsMzr32I46X8qRJtWkhvMDpR hJ+KDEMRkQeHGDW33t7nU7mj+tBFpfrIS6II902FawSdlOzkf5VXW+yzNaoMmWuaQp sRJbuS2JwtIbS1Dz5nAvISAgPTlqqlQbXCDx+Bro= 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 6.9 074/197] s390/pkey: Wipe sensitive data on failure Date: Tue, 9 Jul 2024 13:08:48 +0200 Message-ID: <20240709110711.833681497@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240709110708.903245467@linuxfoundation.org> References: <20240709110708.903245467@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-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 933894065623e..179287157c2fe 100644 --- a/drivers/s390/crypto/pkey_api.c +++ b/drivers/s390/crypto/pkey_api.c @@ -1377,7 +1377,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; } @@ -1412,7 +1412,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