opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed a bug in ACL inheritance

PERMISSION_HANDLING_BRANCH
Jean-Pierre André 2010-04-19 11:05:20 +02:00
parent fcb114502d
commit b1f9d5201a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libntfs-3g/acls.c
View File

@ -563,7 +563,8 @@ static BOOL valid_acl(const ACL *pacl, unsigned int end)
&((const char*)pacl)[offace]; &((const char*)pacl)[offace];
acesz = le16_to_cpu(pace->size); acesz = le16_to_cpu(pace->size);
if (((offace + acesz) > end) if (((offace + acesz) > end)
|| !ntfs_valid_sid(&pace->sid)) || !ntfs_valid_sid(&pace->sid)
|| ((ntfs_sid_size(&pace->sid) + 8) != (int)acesz))
ok = FALSE; ok = FALSE;
offace += acesz; offace += acesz;
} }
@ -707,10 +708,12 @@ int ntfs_inherit_acl(const ACL *oldacl, ACL *newacl,
if (ntfs_same_sid(&pnewace->sid, ownersid)) { if (ntfs_same_sid(&pnewace->sid, ownersid)) {
memcpy(&pnewace->sid, usid, usidsz); memcpy(&pnewace->sid, usid, usidsz);
acesz = usidsz + 8; acesz = usidsz + 8;
pnewace->size = cpu_to_le16(acesz);
} }
if (ntfs_same_sid(&pnewace->sid, groupsid)) { if (ntfs_same_sid(&pnewace->sid, groupsid)) {
memcpy(&pnewace->sid, gsid, gsidsz); memcpy(&pnewace->sid, gsid, gsidsz);
acesz = gsidsz + 8; acesz = gsidsz + 8;
pnewace->size = cpu_to_le16(acesz);
} }
if (pnewace->mask & GENERIC_ALL) { if (pnewace->mask & GENERIC_ALL) {
pnewace->mask &= ~GENERIC_ALL; pnewace->mask &= ~GENERIC_ALL;