Merge pull request #61 from namjaejeon/exfat-next

Exfat next
namjaejeon · Sep 9, 2022 · adde4de · adde4de
2 parents 9b6cba0 + 2b84172
commit adde4de
Show file tree

Hide file tree

Showing 44 changed files with 3,547 additions and 1,284 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ notifications:
 
 before_script:
  - sudo apt-get install linux-headers-$(uname -r)
+ - sudo apt-get install xz-utils
  - git clone --branch=exfat-next https://github.com/namjaejeon/exfat_oot
  - ./.travis_get_mainline_kernel
  - export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
@@ -21,11 +22,16 @@ script:
  - ./configure > /dev/null
  - make -j$((`nproc`+1)) > /dev/null
  - sudo make install > /dev/null
+ # build & install exfat
  - cd exfat_oot
  - make > /dev/null
  - sudo make install > /dev/null
  - sudo modprobe exfat
  - sudo mkdir -p /mnt/test
+ - cd ..
+ # run fsck repair testcases
+ - cd tests
+ - sudo ./test_fsck.sh
  # create file/director test
  - truncate -s 10G test.img
  - sudo losetup /dev/loop22 test.img

diff --git a/Android.bp b/Android.bp
@@ -9,6 +9,7 @@ cc_library_headers {
         "tune",
         "label",
         "dump",
+	"exfat2img",
     ],
 }
 

diff --git a/COPYING b/COPYING
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		            GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		            END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-	        How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it

diff --git a/Makefile.am b/Makefile.am
@@ -2,15 +2,16 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = lib mkfs fsck tune label dump
+SUBDIRS = lib mkfs fsck tune label dump exfat2img
 
 # manpages
 dist_man8_MANS =		\
 	manpages/fsck.exfat.8	\
 	manpages/tune.exfat.8	\
 	manpages/mkfs.exfat.8	\
 	manpages/exfatlabel.8	\
-	manpages/dump.exfat.8
+	manpages/dump.exfat.8	\
+	manpages/exfat2img.8
 
 # other stuff
 EXTRA_DIST =			\
@@ -22,4 +23,5 @@ EXTRA_DIST =			\
 	fsck/Android.bp		\
 	label/Android.bp	\
 	dump/Android.bp		\
+	exfat2img/Android.bp	\
 	README.md
diff --git a/NEWS b/NEWS
@@ -1,3 +1,16 @@
+exfatprogs 1.1.3 - released 2021-11-11
+======================================
+
+CHANGES :
+ * mkfs.exfat: ensure that the cluster size is greater than or
+   equal than the sector size.
+ * mkfs.exfat: replace lseek() + write() with pwrite().
+
+BUG FIXES :
+ * mkfs.exfat: prevent an integer overflow when computing the FAT
+   length.
+ * fsck.exfat: fix a double free memory error.
+
 exfatprogs 1.1.2 - released 2021-05-20
 ======================================
 

diff --git a/README.md b/README.md
@@ -116,4 +116,5 @@ If you have any issues, please create [issues][1] or contact to [Namjae Jeon](ma
 
 ## Contributor information
 * Please base your pull requests on the `exfat-next` branch.
-* Make sure you add 'Signed-Off' information to your commits (e. g. `git commit --signoff`).
+* Make sure you add 'Signed-Off' information to your commits (e.g. `git commit --signoff`).
+* Please check your code contribution using kernel dev-tool script [checkpatch](https://docs.kernel.org/dev-tools/checkpatch.html).
diff --git a/configure.ac b/configure.ac
@@ -32,6 +32,7 @@ AC_CONFIG_FILES([
 	tune/Makefile
 	label/Makefile
 	dump/Makefile
+	exfat2img/Makefile
 ])
 
 AC_OUTPUT
diff --git a/dump/dump.c b/dump/dump.c
@@ -90,6 +90,12 @@ static int exfat_show_ondisk_all_info(struct exfat_blk_dev *bd)
 		goto free_ppbr;
 	}
 
+	if (memcmp(ppbr->bpb.oem_name, "EXFAT   ", 8) != 0) {
+		exfat_err("Bad fs_name in boot sector, which does not describe a valid exfat filesystem\n");
+		ret = -EINVAL;
+		goto free_ppbr;
+	}
+
 	pbsx = &ppbr->bsx;
 
 	if (pbsx->sect_size_bits < EXFAT_MIN_SECT_SIZE_BITS ||

diff --git a/exfat2img/Makefile.am b/exfat2img/Makefile.am
@@ -0,0 +1,6 @@
+AM_CFLAGS = -Wall -Wextra -include $(top_builddir)/config.h -I$(top_srcdir)/include -fno-common
+exfat2img_LDADD = $(top_builddir)/lib/libexfat.a
+
+sbin_PROGRAMS = exfat2img
+
+exfat2img_SOURCES = exfat2img.c
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ cc_library_headers { @@
             "tune",
             "label",
             "dump",
+    	"exfat2img",
         ],
     }
@@ Expand Down @@