Home Explore Help
Sign In
PUBLIC_REPOS
/
buildroot
mirror of git://git.buildroot.net/buildroot
2
1
Fork 0
Files
Tree: c901bef2c8
Branches Tags
buildroot
/
package
/
squashfs
/
squashfs-4.0-mksquashfs-race-condition-fix.patch

squashfs-4.0-mksquashfs-race-condition-fix.patch 1.7 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041 
  1. [PATCH]: fix mksquashfs race condition
    2. 

  2. 

  3. See http://thread.gmane.org/gmane.comp.file-systems.squashfs.devel/76
    4. 

  4. for details.
    5. 

  5. ---
    6. 

  6.  squashfs-tools/mksquashfs.c |    6 +++---
    7. 

  7.  1 file changed, 3 insertions(+), 3 deletions(-)
    8. 

  8. 

  9. Index: squashfs4.0/squashfs-tools/mksquashfs.c
    10. 

  10. ===================================================================
    11. 

  11. --- squashfs4.0.orig/squashfs-tools/mksquashfs.c
    12. 

  12. +++ squashfs4.0/squashfs-tools/mksquashfs.c
    13. 

  13. @@ -1733,8 +1733,8 @@ void unlock_fragments()
    14. 

  14.  		entry->buffer->block = bytes;
    15. 

  15.  		bytes += compressed_size;
    16. 

  16.  		fragments_outstanding --;
    17. 

  17. -		pthread_mutex_unlock(&fragment_mutex);
    18. 

  18.  		queue_put(to_writer, entry->buffer);
    19. 

  19. +		pthread_mutex_unlock(&fragment_mutex);
    20. 

  20.  		pthread_mutex_lock(&fragment_mutex);
    21. 

  21.  		TRACE("fragment_locked writing fragment %d, compressed size %d"
    22. 

  22.  			"\n", entry->fragment, compressed_size);
    23. 

  23. @@ -2426,8 +2426,8 @@ void *frag_deflator(void *arg)
    24. 

  24.  			write_buffer->block = bytes;
    25. 

  25.  			bytes += compressed_size;
    26. 

  26.  			fragments_outstanding --;
    27. 

  27. -			pthread_mutex_unlock(&fragment_mutex);
    28. 

  28.  			queue_put(to_writer, write_buffer);
    29. 

  29. +			pthread_mutex_unlock(&fragment_mutex);
    30. 

  30.  			TRACE("Writing fragment %lld, uncompressed size %d, "
    31. 

  31.  				"compressed size %d\n", file_buffer->block,
    32. 

  32.  				file_buffer->size, compressed_size);
    33. 

  33. @@ -4137,7 +4137,7 @@ void read_recovery_data(char *recovery_f
    34. 

  34.  
    35. 

  35.  
    36. 

  36.  #define VERSION() \
    37. 

  37. -	printf("mksquashfs version 4.0 (2009/04/05)\n");\
    38. 

  38. +	printf("mksquashfs version 4.0-test (2009/04/05)\n");\
    39. 

  39.  	printf("copyright (C) 2009 Phillip Lougher <phillip@lougher.demon.co.uk>\n\n"); \
    40. 

  40.  	printf("This program is free software; you can redistribute it and/or\n");\
    41. 

  41.  	printf("modify it under the terms of the GNU General Public License\n");\
    42.