mirrors/ntfs-3g
0
0
Fork 0
mirror of https://git.code.sf.net/p/ntfs-3g/ntfs-3g.git synced 2024-11-23 10:04:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Accepted displaying bad security descriptors on conditions

Browse Source 
Display security descriptors in ntfssecaudit when they appear as
correctly formed, even when they contain unsupported items.
This commit is contained in:
Jean-Pierre André 2017-02-11 10:37:47 +01:00
parent ea9b8a487c
commit 94677ae961
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ntfsprogs/ntfssecaudit.c
View File

@ -2083,6 +2083,7 @@ static void showhex(FILE *fd)
unsigned int off;
int i;
le32 *pattr;
BOOL acceptable;
BOOL isdump;
BOOL done;
@ -2107,13 +2108,26 @@ static void showhex(FILE *fd)
isdump = ishexdump(line, first, lth);
if (isdump) off = getmsbhex(&line[first]);
/* line is not an hexadecimal dump */
/* display what we have in store */
if ((!isdump || !off) && pos && ntfs_valid_descr((char*)attr,pos)) {
/* display what we have in store if acceptable */
acceptable = ((!isdump || !off)
&& (pos >= 20))
&& (pos > get4l(attr,4))
&& (pos > get4l(attr,8))
&& (pos > get4l(attr,12))
&& (pos > get4l(attr,16))
&& (pos >= ntfs_attr_size(attr));
if (acceptable) {
printf(" Computed hash : 0x%08lx\n",
(unsigned long)hash((le32*)attr,
ntfs_attr_size(attr)));
isdir = guess_dir(attr);
printf(" Estimated type : %s\n",(isdir ? "directory" : "file"));
printf(" Estimated type : %s\n",
(isdir ? "directory" : "file"));
if (!ntfs_valid_descr((char*)attr,pos)) {
printf("** Bad descriptor,"
" trying to display anyway\n");
errors++;
}
showheader(attr,4);
showusid(attr,4);
showgsid(attr,4);
@ -2308,7 +2322,7 @@ static BOOL restore(FILE *fd)
isdump = ishexdump(line, first, lth);
if (isdump) off = getmsbhex(&line[first]);
/* line is not an hexadecimal dump */
/* apply what we have in store */
/* apply what we have in store, only if valid */
if ((!isdump || !off) && pos && ntfs_valid_descr((char*)attr,pos)) {
withattr = TRUE;
if (opt_v >= 2) {