1From 4526a08c6e97ab0260c2c7ae963626d7f7e18ca2 Mon Sep 17 00:00:00 2001
 2From: Michael Forney <mforney@mforney.org>
 3Date: Mon, 6 Sep 2021 23:08:22 -0700
 4Subject: [PATCH] Avoid invalid use of flexible array members
 5
 6---
 7 include/fuse_kernel.h | 10 +++++++---
 8 lib/fuse_lowlevel.c   |  7 +++----
 9 2 files changed, 10 insertions(+), 7 deletions(-)
10
11diff --git a/include/fuse_kernel.h b/include/fuse_kernel.h
12index 018a00a..939af6a 100644
13--- a/include/fuse_kernel.h
14+++ b/include/fuse_kernel.h
15@@ -769,13 +769,17 @@ struct fuse_dirent {
16 
17 struct fuse_direntplus {
18 	struct fuse_entry_out entry_out;
19-	struct fuse_dirent dirent;
20+	uint64_t	ino;
21+	uint64_t	off;
22+	uint32_t	namelen;
23+	uint32_t	type;
24+	char name[];
25 };
26 
27 #define FUSE_NAME_OFFSET_DIRENTPLUS \
28-	offsetof(struct fuse_direntplus, dirent.name)
29+	offsetof(struct fuse_direntplus, name)
30 #define FUSE_DIRENTPLUS_SIZE(d) \
31-	FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET_DIRENTPLUS + (d)->dirent.namelen)
32+	FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET_DIRENTPLUS + (d)->namelen)
33 
34 struct fuse_notify_inval_inode_out {
35 	uint64_t	ino;
36diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
37index ccf52d0..a12f5cc 100644
38--- a/lib/fuse_lowlevel.c
39+++ b/lib/fuse_lowlevel.c
40@@ -367,11 +367,10 @@ size_t fuse_add_direntry_plus(fuse_req_t req, char *buf, size_t bufsize,
41 	if ((buf == NULL) || (entlen_padded > bufsize))
42 	  return entlen_padded;
43 
44-	struct fuse_direntplus *dp = (struct fuse_direntplus *) buf;
45-	memset(&dp->entry_out, 0, sizeof(dp->entry_out));
46-	fill_entry(&dp->entry_out, e);
47+	struct fuse_direntplus *dirent = (struct fuse_direntplus *) buf;
48+	memset(&dirent->entry_out, 0, sizeof(dirent->entry_out));
49+	fill_entry(&dirent->entry_out, e);
50 
51-	struct fuse_dirent *dirent = &dp->dirent;
52 	dirent->ino = e->attr.st_ino;
53 	dirent->off = off;
54 	dirent->namelen = namelen;
55-- 
562.32.0
57