| Message ID | 1470775371-19591-1-git-send-email-andreas.dilger@intel.com |
|---|---|
| State | Rejected, archived |
| Headers | show |
On Tue, Aug 09, 2016 at 02:42:51PM -0600, Andreas Dilger wrote: > Since commit v1.42.12-1-g8a546777119c, the check for in-inode > xattrs in internal_dump_inode_extra() has been incorrectly checking > the value size. The value can go right to the end of the inode. > > Signed-off-by: Andreas Dilger <andreas.dilger@intel.com> This looks like it's another 1.42 related patch. I wasn't planning on putting out another 1.42 maintenance branch, mainly because I just don't have the time. So what I've been doing is trying to see if fixes can apply to the maint branch --- and if they can, I'll apply them there and then merge them into the next / master branches. But for patches where the code in question has changed radically between 1.42 and 1.43, I haven't been bothering to try to apply them into the maint branch, mainly because that just causes patch conflicts lately. I'm planning on retiring the 1.42 maint branch, and merging the maint branch to 1.43, probably after 1.43.2, and then we can start using putting more development related changes to the master/next branches. Any objections to that plan? Is there anyone who needs a 1.42 based maintenance branch for some reason? - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c index 260698c..329451c 100644 --- a/debugfs/debugfs.c +++ b/debugfs/debugfs.c @@ -557,9 +557,11 @@ static void internal_dump_inode_extra(FILE *out, char *value = start + entry->e_value_offs; if (name + entry->e_name_len >= end || - value + entry->e_value_size >= end || - (char *) next >= end) { - fprintf(out, "invalid EA entry in inode\n"); + value + entry->e_value_size > end || + (char *)next >= end) { + fprintf(out, "invalid EA entry in inode: " + "name_len=%u value_size=%u\n", + entry->e_name_len, entry->e_value_size); return; } fprintf(out, " ");
Since commit v1.42.12-1-g8a546777119c, the check for in-inode xattrs in internal_dump_inode_extra() has been incorrectly checking the value size. The value can go right to the end of the inode. Signed-off-by: Andreas Dilger <andreas.dilger@intel.com> --- debugfs/debugfs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)