Skip to contentSkip to conversation

s390/uv: Various fixes for UV secrets

PATCH Applied Steffen Eiden 4 participants 7 messages Aug 12 – Aug 19

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v3 cover s390/uv: Various fixes for UV secrets

To: Christian Borntraeger <[email protected]>
To: Janosch Frank <[email protected]>
To: Claudio Imbrenda <[email protected]>
Cc: David Hildenbrand <[email protected]>
Cc: Heiko Carstens <[email protected]>
Cc: Vasily Gorbik <[email protected]>
Cc: Alexander Gordeev <[email protected]>
Cc: Sven Schnelle <[email protected]>
Cc: Christoph Schlameuss <[email protected]>
Cc: Harald Freudenberger <[email protected]>
Cc: Steffen Eiden <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]

Fix some issues in the retrieve secret infrastructure. First, fix the issue that the loop in uv_find_secret cannot ran more that one round. Second, fix a potential out of bounds issue in find_secret_in_page.

---
Changes in v3:
- Add R-b from Christoph for patch 1
- Improved commit message in patch 1
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- Add Ack from Claudio
- Add patch that fixes a potential out-of-bounds access in find_secret_in_page
- Link to v1: https://lore.kernel.org/r/[email protected]

---
Steffen Eiden (2):
s390/uv: Fix loop condition in uv_find_secrets s390/uv: Prevent potential out-of-bounds read

 arch/s390/kernel/uv.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

---
base-commit: d58772d8520c7ef247c4b95c9bd76d3a25da9ff5
change-id: 20260811-uv_secrets_fix-58a63b4a4ec4

Best regards,

Signature · 1 line
Steffen Eiden <[email protected]>
#1 lore raw

PATCH v3 1/2 s390/uv: Fix loop condition in uv_find_secrets

Systems with more than 85 UV secrets got -ENOENT for any secret past the first page.

Fix this by setting the start index at the beginning of the loop in uv_find_secret() and not at the end. First test if there are more secrets left by comparing start_idx with list->next_secret_idx, and then set the start index to the next secret index.

Fixes 7c9137af2042 ("s390/uv: Retrieve UV secrets support")
---
 arch/s390/kernel/uv.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
arch/s390/kernel/uv.c +4 -2
index a284f98d9716..d970b15ef126 100644
@@ -781,11 +781,14 @@ int uv_find_secret(const u8 secret_id[UV_SECRET_ID_LEN],
 		   struct uv_secret_list *list,
 		   struct uv_secret_list_item_hdr *secret)
 {
-	u16 start_idx = 0;
+	u16 start_idx;
 	u16 list_rc;
 	int ret;
 
+	list->next_secret_idx = 0;
+
 	do {
+		start_idx = list->next_secret_idx;
 		uv_list_secrets(list, start_idx, &list_rc, NULL);
 		if (list_rc != UVC_RC_EXECUTED && list_rc != UVC_RC_MORE_DATA) {
 			if (list_rc == UVC_RC_INV_CMD)
@@ -796,7 +799,6 @@ int uv_find_secret(const u8 secret_id[UV_SECRET_ID_LEN],
 		ret = find_secret_in_page(secret_id, list, secret);
 		if (ret == 0)
 			return ret;
-		start_idx = list->next_secret_idx;
 	} while (list_rc == UVC_RC_MORE_DATA && start_idx < list->next_secret_idx);
 
 	return -ENOENT;
Signature · 1 line
2.53.0
#2 lore raw

Re: [PATCH v3 1/2] s390/uv: Fix loop condition in uv_find_secrets

Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 8 lines

Systems with more than 85 UV secrets got -ENOENT for any secret past the first page.

Fix this by setting the start index at the beginning of the loop in uv_find_secret() and not at the end. First test if there are more secrets left by comparing start_idx with list->next_secret_idx, and then set the start index to the next secret index.

Quoted 4 lines
Fixes 7c9137af2042 ("s390/uv: Retrieve UV secrets support")

Sashiko has reviewed this patch and found no issues. It looks great!

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
#3 lore raw

PATCH v3 2/2 s390/uv: Prevent potential out-of-bounds read

In reply to Steffen Eiden

When the system has more than 85 secrets, the uv_secret_list struct array only holds up to 85 items per page, resulting in an out of bounds read in find_secret_in_page if the targeted secret is in the next page or not stored at all.

Fix this by looping over the number of stored secrets which is the per sub-list count of stored secrets and not the overall count.

Fixes 7c9137af2042 ("s390/uv: Retrieve UV secrets support")
---
 arch/s390/kernel/uv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kernel/uv.c +1 -1
index d970b15ef126..e70acad09cd5 100644
@@ -760,7 +760,7 @@ static int find_secret_in_page(const u8 secret_id[UV_SECRET_ID_LEN],
 {
 	u16 i;
 
-	for (i = 0; i < list->total_num_secrets; i++) {
+	for (i = 0; i < list->num_secr_stored; i++) {
 		if (memcmp(secret_id, list->secrets[i].id, UV_SECRET_ID_LEN) == 0) {
 			*secret = list->secrets[i].hdr;
 			return 0;
Signature · 1 line
2.53.0
#4 lore raw

Re: [PATCH v3 2/2] s390/uv: Prevent potential out-of-bounds read

Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 10 lines

When the system has more than 85 secrets, the uv_secret_list struct array only holds up to 85 items per page, resulting in an out of bounds read in find_secret_in_page if the targeted secret is in the next page or not stored at all.

Fix this by looping over the number of stored secrets which is the per sub-list count of stored secrets and not the overall count.

Fixes 7c9137af2042 ("s390/uv: Retrieve UV secrets support")

Sashiko has reviewed this patch and found no issues. It looks great!

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
Reviewed-by on v3 2/2
#5 lore raw

Re: [PATCH v3 2/2] s390/uv: Prevent potential out-of-bounds read

In reply to Steffen Eiden
Quoted 10 lines · Steffen Eiden

When the system has more than 85 secrets, the uv_secret_list struct array only holds up to 85 items per page, resulting in an out of bounds read in find_secret_in_page if the targeted secret is in the next page or not stored at all.

Fix this by looping over the number of stored secrets which is the per sub-list count of stored secrets and not the overall count.

Fixes 7c9137af2042 ("s390/uv: Retrieve UV secrets support")
Quoted 17 lines
---
 arch/s390/kernel/uv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kernel/uv.c +1 -1
index d970b15ef126..e70acad09cd5 100644
@@ -760,7 +760,7 @@ static int find_secret_in_page(const u8 secret_id[UV_SECRET_ID_LEN],
 {
 	u16 i;
 
-	for (i = 0; i < list->total_num_secrets; i++) {
+	for (i = 0; i < list->num_secr_stored; i++) {
 		if (memcmp(secret_id, list->secrets[i].id, UV_SECRET_ID_LEN) == 0) {
 			*secret = list->secrets[i].hdr;
 			return 0;
maintainer Applied
#6 lore raw
In reply to Steffen Eiden

Am 12.08.26 um 17:55 schrieb Steffen Eiden:

Quoted 34 lines

To: Christian Borntraeger <[email protected]>
To: Janosch Frank <[email protected]>
To: Claudio Imbrenda <[email protected]>
Cc: David Hildenbrand <[email protected]>
Cc: Heiko Carstens <[email protected]>
Cc: Vasily Gorbik <[email protected]>
Cc: Alexander Gordeev <[email protected]>
Cc: Sven Schnelle <[email protected]>
Cc: Christoph Schlameuss <[email protected]>
Cc: Harald Freudenberger <[email protected]>
Cc: Steffen Eiden <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]

Fix some issues in the retrieve secret infrastructure. First, fix the issue that the loop in uv_find_secret cannot ran more that one round. Second, fix a potential out of bounds issue in find_secret_in_page.

---
Changes in v3:
- Add R-b from Christoph for patch 1
- Improved commit message in patch 1
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- Add Ack from Claudio
- Add patch that fixes a potential out-of-bounds access in find_secret_in_page
- Link to v1: https://lore.kernel.org/r/[email protected]

---
Steffen Eiden (2):
s390/uv: Fix loop condition in uv_find_secrets s390/uv: Prevent potential out-of-bounds read

Quoted 7 lines
  arch/s390/kernel/uv.c | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)

---
base-commit: d58772d8520c7ef247c4b95c9bd76d3a25da9ff5
change-id: 20260811-uv_secrets_fix-58a63b4a4ec4

Best regards,

Thanks applied.