Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From: http://marc.info/?l=openbsd-tech&m=140234174104724&w=2

Browse Source 
Avoid off-by-one on FAT12 filesystems.
This commit is contained in:
christos 2014-07-07 18:46:45 +00:00
parent 468753370f
commit d7660c3645
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sbin/fsck_msdos/fat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fat.c,v 1.26 2014/07/07 17:55:53 christos Exp $ */ /* $NetBSD: fat.c,v 1.27 2014/07/07 18:46:45 christos Exp $ */
/* /*
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank * Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
@ -28,7 +28,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: fat.c,v 1.26 2014/07/07 17:55:53 christos Exp $"); __RCSID("$NetBSD: fat.c,v 1.27 2014/07/07 18:46:45 christos Exp $");
#endif /* not lint */ #endif /* not lint */
#include <stdlib.h> #include <stdlib.h>
@ -554,13 +554,15 @@ writefat(int fs, struct bootblock *boot, struct fatEntry *fat, int correct_fat)
default: default:
if (fat[cl].next == CLUST_FREE) if (fat[cl].next == CLUST_FREE)
boot->NumFree++; boot->NumFree++;
if (cl + 1 < boot->NumClusters
&& fat[cl + 1].next == CLUST_FREE)
boot->NumFree++;
*p++ = (u_char)fat[cl].next; *p++ = (u_char)fat[cl].next;
*p++ = (u_char)((fat[cl].next >> 8) & 0xf) *p++ = (u_char)((fat[cl].next >> 8) & 0xf);
|(u_char)(fat[cl+1].next << 4); cl++;
*p++ = (u_char)(fat[++cl].next >> 4); if (cl >= boot->NumClusters)
break;
if (fat[cl].next == CLUST_FREE)
boot->NumFree++;
*p |= (u_char)(fat[cl + 1].next << 4);
*p++ = (u_char)(fat[cl + 1].next >> 4);
break; break;
} }
} }