The branch, master has been updated
via 8c47b5d52ff librpc:ndr:keycredlink fix CID 1660828
from f173b4fd5f0 s3:smbd: Fix CID 1449599 replacing memcpy to memmove to
avoid overflow
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8c47b5d52ff067ebfef05ce9f3470b96579de1a5
Author: Gary Lockyer <g...@catalyst.net.nz>
Date: Fri Aug 1 07:58:52 2025 +1200
librpc:ndr:keycredlink fix CID 1660828
Fixes:
*** CID 1660828: Control flow issues (UNREACHABLE)
/librpc/ndr/ndr_keycredlink.c: 752 in pull_DER_RSA_KEY()
746 goto out;
747 }
748 if (!asn1_end_tag(asn)) { /* PublicKeyInfo */
749 return ndr_pull_error(ndr,
750 NDR_ERR_UNREAD_BYTES,
751 "ASN1 element PublicKeyInfo");
>>> CID 1660828: Control flow issues (UNREACHABLE)
>>> This code cannot be reached: "goto out;".
752 goto out;
753 }
Signed-off-by: Gary Lockyer <g...@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Anoop C S <anoo...@samba.org>
Autobuild-User(master): Anoop C S <anoo...@samba.org>
Autobuild-Date(master): Fri Aug 1 14:21:17 UTC 2025 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
librpc/ndr/ndr_keycredlink.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/ndr/ndr_keycredlink.c b/librpc/ndr/ndr_keycredlink.c
index 2222e3bf666..286236060c4 100644
--- a/librpc/ndr/ndr_keycredlink.c
+++ b/librpc/ndr/ndr_keycredlink.c
@@ -746,9 +746,9 @@ static enum ndr_err_code pull_DER_RSA_KEY(struct ndr_pull
*ndr,
goto out;
}
if (!asn1_end_tag(asn)) { /* PublicKeyInfo */
- return ndr_pull_error(ndr,
- NDR_ERR_UNREAD_BYTES,
- "ASN1 element PublicKeyInfo");
+ ret = ndr_pull_error(ndr,
+ NDR_ERR_UNREAD_BYTES,
+ "ASN1 element PublicKeyInfo");
goto out;
}
--
Samba Shared Repository
