sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-03 12:58:35 +03:00
Code

Fix a segfault in wbcLookupRids

Browse Source 
The done: part could access uninitialized memory if intermediate
BAIL_ON_WBC_ERROR fire.

Jerry, please check!

Thanks,

Volker
(cherry picked from commit 31f4c33dcc744e81be54389756378e25aa2bb75e)
(This used to be commit 5b12d8aa510689114e5413be5afe6aeb6ec2d9db)
This commit is contained in:
Volker Lendecke 2008-06-17 15:17:22 +02:00
parent 7f9acfae73
commit 6f66dbcda6
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source3/nsswitch/libwbclient/wbc_sid.c
View File

@ -309,8 +309,8 @@ wbcErr wbcLookupRids(struct wbcDomainSid *dom_sid,
int num_rids, int num_rids,
uint32_t *rids, uint32_t *rids,
const char **pp_domain_name, const char **pp_domain_name,
const char ***names, const char ***pnames,
enum wbcSidType **types) enum wbcSidType **ptypes)
{ {
size_t i, len, ridbuf_size; size_t i, len, ridbuf_size;
char *ridlist; char *ridlist;
@ -319,6 +319,8 @@ wbcErr wbcLookupRids(struct wbcDomainSid *dom_sid,
struct winbindd_response response; struct winbindd_response response;
char *sid_string = NULL; char *sid_string = NULL;
char *domain_name = NULL; char *domain_name = NULL;
const char **names = NULL;
enum wbcSidType *types = NULL;
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE; wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
/* Initialise request */ /* Initialise request */
@ -370,11 +372,11 @@ wbcErr wbcLookupRids(struct wbcDomainSid *dom_sid,
domain_name = talloc_strdup(NULL, response.data.domain_name); domain_name = talloc_strdup(NULL, response.data.domain_name);
BAIL_ON_PTR_ERROR(domain_name, wbc_status); BAIL_ON_PTR_ERROR(domain_name, wbc_status);
*names = talloc_array(NULL, const char*, num_rids); names = talloc_array(NULL, const char*, num_rids);
BAIL_ON_PTR_ERROR((*names), wbc_status); BAIL_ON_PTR_ERROR(names, wbc_status);
*types = talloc_array(NULL, enum wbcSidType, num_rids); types = talloc_array(NULL, enum wbcSidType, num_rids);
BAIL_ON_PTR_ERROR((*types), wbc_status); BAIL_ON_PTR_ERROR(types, wbc_status);
p = (char *)response.extra_data.data; p = (char *)response.extra_data.data;
@ -386,7 +388,7 @@ wbcErr wbcLookupRids(struct wbcDomainSid *dom_sid,
BAIL_ON_WBC_ERROR(wbc_status); BAIL_ON_WBC_ERROR(wbc_status);
} }
(*types)[i] = (enum wbcSidType)strtoul(p, &q, 10); types[i] = (enum wbcSidType)strtoul(p, &q, 10);
if (*q != ' ') { if (*q != ' ') {
wbc_status = WBC_ERR_INVALID_RESPONSE; wbc_status = WBC_ERR_INVALID_RESPONSE;
@ -402,8 +404,8 @@ wbcErr wbcLookupRids(struct wbcDomainSid *dom_sid,
*q = '\0'; *q = '\0';
(*names)[i] = talloc_strdup((*names), p); names[i] = talloc_strdup(names, p);
BAIL_ON_PTR_ERROR(((*names)[i]), wbc_status); BAIL_ON_PTR_ERROR(names[i], wbc_status);
p = q+1; p = q+1;
} }
@ -420,15 +422,18 @@ wbcErr wbcLookupRids(struct wbcDomainSid *dom_sid,
free(response.extra_data.data); free(response.extra_data.data);
} }
if (!WBC_ERROR_IS_OK(wbc_status)) { if (WBC_ERROR_IS_OK(wbc_status)) {
*pp_domain_name = domain_name;
*pnames = names;
*ptypes = types;
}
else {
if (domain_name) if (domain_name)
talloc_free(domain_name); talloc_free(domain_name);
if (*names) if (names)
talloc_free(*names); talloc_free(names);
if (*types) if (types)
talloc_free(*types); talloc_free(types);
} else {
*pp_domain_name = domain_name;
} }
return wbc_status; return wbc_status;