2024-06-11 07:40:35

by Su Hui

Subject: [PATCH] block: sed-opal: avoid possible wrong address reference in read_sed_opal_key()

Clang static checker (scan-build) warning:
block/sed-opal.c:line 317, column 3
Value stored to 'ret' is never read.

Fix this problem by returning the error code when keyring_search() failed.
Otherwise, 'key' will have a wrong value when 'kerf' stores the error code.

Fixes: 3bfeb6125664 ("block: sed-opal: keyring support for SED keys")
Signed-off-by: Su Hui <[email protected]>
---
block/sed-opal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/sed-opal.c b/block/sed-opal.c
index 14fe0fef811c..598fd3e7fcc8 100644
--- a/block/sed-opal.c
+++ b/block/sed-opal.c
@@ -314,7 +314,7 @@ static int read_sed_opal_key(const char *key_name, u_char *buffer, int buflen)
&key_type_user, key_name, true);

if (IS_ERR(kref))
- ret = PTR_ERR(kref);
+ return PTR_ERR(kref);

key = key_ref_to_ptr(kref);
down_read(&key->sem);
--
2.30.2

2024-06-12 17:01:16

by Jens Axboe

Subject: Re: [PATCH] block: sed-opal: avoid possible wrong address reference in read_sed_opal_key()

On Tue, 11 Jun 2024 15:37:00 +0800, Su Hui wrote:
> Clang static checker (scan-build) warning:
> block/sed-opal.c:line 317, column 3
> Value stored to 'ret' is never read.
>
> Fix this problem by returning the error code when keyring_search() failed.
> Otherwise, 'key' will have a wrong value when 'kerf' stores the error code.
>
> [...]

Applied, thanks!

[1/1] block: sed-opal: avoid possible wrong address reference in read_sed_opal_key()
commit: 9b1ebce6a1fded90d4a1c6c57dc6262dac4c4c14

Best regards,
--
Jens Axboe