|
 |
897056 |
From f140a8e5fdb2f3b9fbc3b32d1a844554008c2298 Mon Sep 17 00:00:00 2001
|
|
|
897056 |
From: William Roberts <william.c.roberts@intel.com>
|
|
|
897056 |
Date: Fri, 3 Jun 2022 11:51:02 -0500
|
|
|
897056 |
Subject: [PATCH 20/23] esys_iutil: fix possible NPD
|
|
|
897056 |
|
|
|
897056 |
Clang-10 scan-build reports:
|
|
|
897056 |
src/tss2-esys/esys_iutil.c:1366:56: warning: Dereference of null pointer
|
|
|
897056 |
auths->auths[auths->count].sessionHandle = session->rsrc.handle;
|
|
|
897056 |
^~~~~~~~~~~~~~~~~~~~
|
|
|
897056 |
1 warning generated.
|
|
|
897056 |
|
|
|
897056 |
The code above the report checks that session might be NULL:
|
|
|
897056 |
RSRC_NODE_T *session = esys_context->session_tab[session_idx];
|
|
|
897056 |
if (session != NULL) {
|
|
|
897056 |
IESYS_SESSION *rsrc_session = &session->rsrc.misc.rsrc_session;
|
|
|
897056 |
if (rsrc_session->type_policy_session == POLICY_PASSWORD) {
|
|
|
897056 |
|
|
|
897056 |
Thus suggesting/indicating session may be NULL in subsequent code where
|
|
|
897056 |
session is dereferenced.
|
|
|
897056 |
|
|
|
897056 |
Signed-off-by: William Roberts <william.c.roberts@intel.com>
|
|
|
897056 |
---
|
|
|
897056 |
src/tss2-esys/esys_iutil.c | 2 +-
|
|
|
897056 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
897056 |
|
|
|
897056 |
diff --git a/src/tss2-esys/esys_iutil.c b/src/tss2-esys/esys_iutil.c
|
|
|
897056 |
index 0cc92ca5..493f9b28 100644
|
|
|
897056 |
--- a/src/tss2-esys/esys_iutil.c
|
|
|
897056 |
+++ b/src/tss2-esys/esys_iutil.c
|
|
|
897056 |
@@ -1339,7 +1339,7 @@ iesys_gen_auths(ESYS_CONTEXT * esys_context,
|
|
|
897056 |
&& encryptNonceIdx > 0) ? encryptNonce : NULL,
|
|
|
897056 |
&auths->auths[session_idx]);
|
|
|
897056 |
return_if_error(r, "Error while computing hmacs");
|
|
|
897056 |
- if (esys_context->session_tab[session_idx] != NULL) {
|
|
|
897056 |
+ if (esys_context->session_tab[session_idx] != NULL && session != NULL) {
|
|
|
897056 |
auths->auths[auths->count].sessionHandle = session->rsrc.handle;
|
|
|
897056 |
auths->count++;
|
|
|
897056 |
}
|
|
|
897056 |
--
|
|
|
897056 |
2.34.3
|
|
|
897056 |
|