- fixed fsck.vfat crashing [bnc#677236]

OBS-URL: https://build.opensuse.org/package/show/Base:System/dosfstools?expand=0&rev=19
This commit is contained in:
Petr Gajdos 2011-03-09 11:40:44 +00:00 committed by Git OBS Bridge
parent 16f956640c
commit 608ed90113
3 changed files with 25 additions and 2 deletions

View File

@ -0,0 +1,16 @@
Index: dosfstools-3.0.10/src/check.c
===================================================================
--- dosfstools-3.0.10.orig/src/check.c
+++ dosfstools-3.0.10/src/check.c
@@ -174,7 +174,10 @@ loff_t alloc_rootdir_entry(DOS_FS *fs, D
offset = fs->root_start+next_free*sizeof(DIR_ENT);
memset(de,0,sizeof(DIR_ENT));
while (1) {
- sprintf(de->name,pattern,curr_num);
+ char expanded[12];
+ sprintf(expanded, pattern, curr_num);
+ memcpy(de->name, expanded, 8);
+ memcpy(de->ext, expanded+8, 3);
for (scan = 0; scan < fs->root_entries; scan++)
if (scan != next_free &&
!strncmp(root[scan].name,de->name,MSDOS_NAME))

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 8 18:13:53 CET 2011 - pgajdos@suse.cz
- fixed fsck.vfat crashing [bnc#677236]
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 20 15:12:52 CET 2010 - pgajdos@suse.cz Mon Dec 20 15:12:52 CET 2010 - pgajdos@suse.cz

View File

@ -1,7 +1,7 @@
# #
# spec file for package dosfstools (Version 3.0.10) # spec file for package dosfstools (Version 3.0.10)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -25,12 +25,13 @@ Group: System/Filesystems
AutoReqProv: on AutoReqProv: on
Summary: Utilities for Making and Checking MS-DOS FAT File Systems on Linux Summary: Utilities for Making and Checking MS-DOS FAT File Systems on Linux
Version: 3.0.10 Version: 3.0.10
Release: 1 Release: 3
Url: http://freshmeat.net/projects/dosfstools Url: http://freshmeat.net/projects/dosfstools
Source: %{name}_%{version}.orig.tar.bz2 Source: %{name}_%{version}.orig.tar.bz2
Patch0: %{name}-suse-dirs.patch Patch0: %{name}-suse-dirs.patch
Patch1: %{name}-mdraid-partition.patch Patch1: %{name}-mdraid-partition.patch
Patch2: %{name}-label.patch Patch2: %{name}-label.patch
Patch3: %{name}-filename-buffer-overflow.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Supplements: filesystem(vfat) Supplements: filesystem(vfat)
@ -52,6 +53,7 @@ Authors:
%patch0 -p1 %patch0 -p1
%patch1 %patch1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%build %build
make OPTFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $RPM_OPT_FLAGS" make OPTFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $RPM_OPT_FLAGS"