diff options
| author | Volker Lendecke <vl@samba.org> | 2015-01-22 12:08:52 +0000 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2015-01-22 17:58:16 +0100 |
| commit | 63552f1c4c05a710143f12c2269754d0e547d945 (patch) | |
| tree | 30a14552c9441d1e4f14be05f874dfc79eac5cd1 /source3/winbindd | |
| parent | 0cb9b28acb7008cd30c6de3add9876eb5607a5a6 (diff) | |
| download | samba-63552f1c4c05a710143f12c2269754d0e547d945.tar.gz samba-63552f1c4c05a710143f12c2269754d0e547d945.tar.xz samba-63552f1c4c05a710143f12c2269754d0e547d945.zip | |
winbind: Fix idmap initialization
The fix is in the sscanf line: %u in the sscanf format mandates the use of
a pointer to an "unsigned". idmap_domain->[low|high]_id are uint32_t. On
little endian 64-bit this might at least put the correct values into
low_id and high_id, but might overwrite the read_only bit set earlier,
depending on structure alignment and packing. On big endian 64-bit,
this will just fail.
Automatic conversion to uint32_t will happen only at assignment, not
when you take a pointer of such a thing.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Jan 22 17:58:16 CET 2015 on sn-devel-104
Diffstat (limited to 'source3/winbindd')
| -rw-r--r-- | source3/winbindd/idmap.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c index a8beab738b..841f710676 100644 --- a/source3/winbindd/idmap.c +++ b/source3/winbindd/idmap.c @@ -172,6 +172,7 @@ static struct idmap_domain *idmap_init_domain(TALLOC_CTX *mem_ctx, NTSTATUS status; char *config_option = NULL; const char *range; + unsigned low_id, high_id; result = talloc_zero(mem_ctx, struct idmap_domain); if (result == NULL) { @@ -230,23 +231,24 @@ static struct idmap_domain *idmap_init_domain(TALLOC_CTX *mem_ctx, result->name)); goto fail; } - } else if (sscanf(range, "%u - %u", &result->low_id, - &result->high_id) != 2) + } else if (sscanf(range, "%u - %u", &low_id, &high_id) != 2) { DEBUG(1, ("invalid range '%s' specified for domain " "'%s'\n", range, result->name)); if (check_range) { goto fail; } - } else if (result->low_id > result->high_id) { - DEBUG(1, ("Error: invalid idmap range detected: %lu - %lu\n", - (unsigned long)result->low_id, - (unsigned long)result->high_id)); + } else if (low_id > high_id) { + DEBUG(1, ("Error: invalid idmap range detected: %u - %u\n", + low_id, high_id)); if (check_range) { goto fail; } } + result->low_id = low_id; + result->high_id = high_id; + status = result->methods->init(result); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("idmap initialization returned %s\n", |