diff mbox series

filefrag: avoid temporary buffer overflow

Message ID 1522348614-17161-1-git-send-email-adilger@dilger.ca
State Accepted, archived
Headers show
Series filefrag: avoid temporary buffer overflow | expand

Commit Message

Andreas Dilger March 29, 2018, 6:36 p.m. UTC
If an unknown flag is present in a FIEMAP extent, it is printed as a
hex value into a temporary buffer before adding it to the flags.  If
that unknown flag is over 0xfff then it will overflow the temporary
buffer.

Reported-by: Sarah Liu <wei3.liu@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-10335
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
---
 misc/filefrag.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Theodore Ts'o March 30, 2018, 3:35 a.m. UTC | #1
On Thu, Mar 29, 2018 at 12:36:54PM -0600, Andreas Dilger wrote:
> If an unknown flag is present in a FIEMAP extent, it is printed as a
> hex value into a temporary buffer before adding it to the flags.  If
> that unknown flag is over 0xfff then it will overflow the temporary
> buffer.
> 
> Reported-by: Sarah Liu <wei3.liu@intel.com>
> Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-10335
> Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>

It's applied now.  Apologies for dropping it earlier.

     	     	   	     	 	  - Ted
diff mbox series

Patch

diff --git a/misc/filefrag.c b/misc/filefrag.c
index 9c57ab9..dc00393 100644
--- a/misc/filefrag.c
+++ b/misc/filefrag.c
@@ -179,7 +179,7 @@  static void print_extent_info(struct fiemap_extent *fm_extent, int cur_ex,
 	print_flag(&fe_flags, FIEMAP_EXTENT_SHARED, flags, "shared,");
 	/* print any unknown flags as hex values */
 	for (mask = 1; fe_flags != 0 && mask != 0; mask <<= 1) {
-		char hex[6];
+		char hex[sizeof(mask) * 2 + 4]; /* 2 chars/byte + 0x, + NUL */
 
 		if ((fe_flags & mask) == 0)
 			continue;