evin/ms-nfs41-client
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixing null pointer deref in setowner/group

Browse source
This commit is contained in:
Olga Kornievskaia 2011-08-26 16:27:19 -04:00
parent fa09329167
commit 971762498b
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
daemon/acl.c
View file

@ -719,6 +719,7 @@ static int handle_setacl(nfs41_upcall *upcall)
BOOL sid_default, gsid_default; BOOL sid_default, gsid_default;
if (args->query & OWNER_SECURITY_INFORMATION) { if (args->query & OWNER_SECURITY_INFORMATION) {
char owner[NFS4_OPAQUE_LIMIT];
dprintf(1, "handle_setacl: OWNER_SECURITY_INFORMATION\n"); dprintf(1, "handle_setacl: OWNER_SECURITY_INFORMATION\n");
status = GetSecurityDescriptorOwner(args->sec_desc, &sid, &sid_default); status = GetSecurityDescriptorOwner(args->sec_desc, &sid, &sid_default);
if (!status) { if (!status) {
@ -726,6 +727,7 @@ static int handle_setacl(nfs41_upcall *upcall)
eprintf("GetSecurityDescriptorOwner failed with %d\n", status); eprintf("GetSecurityDescriptorOwner failed with %d\n", status);
goto out; goto out;
} }
info.owner = owner;
status = map_nfs4ace_who(sid, NULL, NULL, info.owner, status = map_nfs4ace_who(sid, NULL, NULL, info.owner,
state->session->client->domain_name); state->session->client->domain_name);
if (status) if (status)
@ -736,6 +738,7 @@ static int handle_setacl(nfs41_upcall *upcall)
} }
} }
if (args->query & GROUP_SECURITY_INFORMATION) { if (args->query & GROUP_SECURITY_INFORMATION) {
char group[NFS4_OPAQUE_LIMIT];
dprintf(1, "handle_setacl: GROUP_SECURITY_INFORMATION\n"); dprintf(1, "handle_setacl: GROUP_SECURITY_INFORMATION\n");
status = GetSecurityDescriptorGroup(args->sec_desc, &sid, &sid_default); status = GetSecurityDescriptorGroup(args->sec_desc, &sid, &sid_default);
if (!status) { if (!status) {
@ -743,6 +746,7 @@ static int handle_setacl(nfs41_upcall *upcall)
eprintf("GetSecurityDescriptorOwner failed with %d\n", status); eprintf("GetSecurityDescriptorOwner failed with %d\n", status);
goto out; goto out;
} }
info.owner_group = group;
status = map_nfs4ace_who(sid, NULL, NULL, info.owner_group, status = map_nfs4ace_who(sid, NULL, NULL, info.owner_group,
state->session->client->domain_name); state->session->client->domain_name);
if (status) if (status)