sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

winbind: Fix idmap initialization

Browse Source 
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
This commit is contained in:
Volker Lendecke 2015-01-22 12:08:52 +00:00 committed by Andreas Schneider
parent 0cb9b28acb
commit 63552f1c4c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source3/winbindd/idmap.c
View File

@ -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",