Changes by: szaka
Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4244/ntfsprogs
Modified Files:
mkntfs.c
Log Message:
initialize_secure(): fix segfault when non-allocated objects were referenced
(thanks to ef)
Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- mkntfs.c 13 Nov 2005 20:04:29 -0000 1.105
+++ mkntfs.c 13 Nov 2005 22:40:19 -0000 1.106
@@ -2878,6 +2878,8 @@ static int initialize_secure(char *sds,
err = 0;
while ((char*)sds_header < (char*)sds + sds_size) {
+ if (!sds_header->length)
+ break;
/* SDH index entry */
idx_entry_sdh->data_offset = cpu_to_le16(0x18);
idx_entry_sdh->data_length = cpu_to_le16(0x14);
@@ -2923,8 +2925,6 @@ static int initialize_secure(char *sds,
sds_header = (SECURITY_DESCRIPTOR_HEADER*)((char*)sds_header +
(cpu_to_le32(sds_header->length + 0x0F) &
~cpu_to_le32(0x0F)));
- if (!sds_header->length)
- break;
}
free(idx_entry_sdh);
|
