The branch, master has been updated
via 0c461f3bd58 lzxpress: avoid technically undefined shift
via 9c3ff1b9554 lib/util/asn1: avoid technically undefined shift
via 2e37d224991 Fix clang 9 format-nonliteral warning
from e3079c53877 python/samba/tests/blackbox: Tests with nested DFS
container
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0c461f3bd589764c496b530f698e313df50667e6
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Thu Aug 6 17:17:01 2020 +1200
lzxpress: avoid technically undefined shift
UBSAN:
runtime error: left shift of 1 by 31 places cannot be represented in type
'int'
Credit to OSS-fuzz.
REF: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=22283
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Mon Aug 31 22:31:13 UTC 2020 on sn-devel-184
commit 9c3ff1b9554905ad03fcd22afb832936073b2c31
Author: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Date: Thu Aug 6 17:10:30 2020 +1200
lib/util/asn1: avoid technically undefined shift
UBSAN says
runtime error: left shift of 255 by 24 places cannot be represented in
type 'int'
Credit to OSS-Fuzz.
REF: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=22889
Signed-off-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 2e37d2249916e959a79fd09af73b3e94a4be2b79
Author: Gary Lockyer <g...@catalyst.net.nz>
Date: Thu Aug 27 13:50:16 2020 +1200
Fix clang 9 format-nonliteral warning
Signed-off-by: Gary Lockyer <g...@catalyst.net.nz>
Reviewed-by: Noel Power <noel.po...@suse.com>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/compression/lzxpress.c | 2 +-
lib/util/asn1.c | 2 +-
source3/winbindd/idmap_ad.c | 9 +++++----
3 files changed, 7 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/compression/lzxpress.c b/lib/compression/lzxpress.c
index d8326304455..3453dd36f2a 100644
--- a/lib/compression/lzxpress.c
+++ b/lib/compression/lzxpress.c
@@ -180,7 +180,7 @@ ssize_t lzxpress_compress(const uint8_t *uncompressed,
}
}
- indic |= 1 << (32 - ((indic_bit % 32) + 1));
+ indic |= 1U << (32 - ((indic_bit % 32) + 1));
if (best_len > 9) {
if (nibble_index == 0) {
diff --git a/lib/util/asn1.c b/lib/util/asn1.c
index 0dfddc009c0..6b1b4bc2877 100644
--- a/lib/util/asn1.c
+++ b/lib/util/asn1.c
@@ -1052,7 +1052,7 @@ bool asn1_read_BitString(struct asn1_data *data,
TALLOC_CTX *mem_ctx, DATA_BLOB
/* read a non-negative enumerated value */
bool asn1_read_enumerated(struct asn1_data *data, int *v)
{
- unsigned int val_will_wrap = (0xFF << ((sizeof(int)*8)-8));
+ unsigned int val_will_wrap = (0xFFU << ((sizeof(int)*8)-8));
*v = 0;
if (!asn1_start_tag(data, ASN1_ENUMERATED)) return false;
diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
index 3bfeeee2d74..bd5add9aca2 100644
--- a/source3/winbindd/idmap_ad.c
+++ b/source3/winbindd/idmap_ad.c
@@ -254,10 +254,11 @@ static TLDAPRC get_posix_schema_names(struct
tldap_context *ld,
return TLDAP_SUCCESS;
}
-static void idmap_ad_tldap_debug(void *log_private,
- enum tldap_debug_level level,
- const char *fmt,
- va_list ap)
+static void PRINTF_ATTRIBUTE(3, 0) idmap_ad_tldap_debug(
+ void *log_private,
+ enum tldap_debug_level level,
+ const char *fmt,
+ va_list ap)
{
int samba_level = -1;
--
Samba Shared Repository
