ovl: Check for NULL d_inode() in ovl_dentry_upper()
PATCH 1/1 ovl: Check for NULL d_inode() in ovl_dentry_upper()
In ovl_path_type() and ovl_is_metacopy_dentry() GCC notices that it is possible for OVL_E() to return NULL (which implies that d_inode(dentry) may be NULL). This would result in out of bounds reads via container_of(), seen with GCC 15's -Warray-bounds -fdiagnostics-details. For example:
In file included from arch/x86/include/generated/asm/rwonce.h:1,
from include/linux/compiler.h:339, from include/linux/export.h:5,
from include/linux/linkage.h:7,
from include/linux/fs.h:5,
from fs/overlayfs/util.c:7:
In function 'ovl_upperdentry_dereference',
inlined from 'ovl_dentry_upper' at ../fs/overlayfs/util.c:305:9,
inlined from 'ovl_path_type' at ../fs/overlayfs/util.c:216:6:
include/asm-generic/rwonce.h:44:26: error: array subscript 0 is outside array bounds of 'struct inode[7486503276667837]' [-Werror=array-bounds=]
44 | #define __READ_ONCE(x) (*(const volatile __unqual_scalar_typeof(x) *)&(x))
| ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/asm-generic/rwonce.h:50:9: note: in expansion of macro '__READ_ONCE'
50 | __READ_ONCE(x); \
| ^~~~~~~~~~~
fs/overlayfs/ovl_entry.h:195:16: note: in expansion of macro 'READ_ONCE'
195 | return READ_ONCE(oi->__upperdentry);
| ^~~~~~~~~ 'ovl_path_type': event 1
185 | return inode ? OVL_I(inode)->oe : NULL;
'ovl_path_type': event 2
Avoid this by allowing ovl_dentry_upper() to return NULL if d_inode() is NULL, as that means the problematic dereferencing can never be reached. Note that this fixes the over-eager compiler warning in an effort to being able to enable -Warray-bounds globally. There is no known behavioral bug here.
---
This is the spirital v2 of https://lore.kernel.org/lkml/[email protected]/
Cc: Miklos Szeredi <[email protected]>
Cc: Amir Goldstein <[email protected]>
Cc: [email protected]
--- fs/overlayfs/util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/overlayfs/util.c +3 -1
@@ -305,7 +305,9 @@ enum ovl_path_type ovl_path_realdata(struct dentry *dentry, struct path *path)struct dentry *ovl_dentry_upper (struct dentry *dentry) { -return ovl_upperdentry_dereference (OVL_I (d_inode (dentry))); +struct inode *inode =d_inode (dentry); + +return inode ?ovl_upperdentry_dereference (OVL_I (inode)) :NULL ; }struct dentry *ovl_dentry_lower (struct dentry *dentry)
Signature · 1 line
2.34.1
Quoted 28 lines · Kees Cook
In
ovl_path_type()andovl_is_metacopy_dentry()GCC notices that it is possible forOVL_E()to return NULL (which implies thatd_inode(dentry)may be NULL). This would result in out of bounds reads viacontainer_of(), seen with GCC 15's -Warray-bounds -fdiagnostics-details. For example:In file included from
arch/x86/include/generated/asm/rwonce.h:1,
frominclude/linux/compiler.h:339, frominclude/linux/export.h:5,
frominclude/linux/linkage.h:7,
frominclude/linux/fs.h:5,
fromfs/overlayfs/util.c:7:
In function 'ovl_upperdentry_dereference',inlined from 'ovl_dentry_upper' at ../fs/overlayfs/util.c:305:9, inlined from 'ovl_path_type' at ../fs/overlayfs/util.c:216:6: include/asm-generic/rwonce.h:44:26: error: array subscript 0 is outside array bounds of 'struct inode[7486503276667837]' [-Werror=array-bounds=] 44 | #define __READ_ONCE(x) (*(const volatile __unqual_scalar_typeof(x) *)&(x)) | ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/asm-generic/rwonce.h:50:9: note: in expansion of macro '__READ_ONCE' 50 | __READ_ONCE(x); \ | ^~~~~~~~~~~ fs/overlayfs/ovl_entry.h:195:16: note: in expansion of macro 'READ_ONCE' 195 | return READ_ONCE(oi->__upperdentry); | ^~~~~~~~~'
ovl_path_type': event 1
185 | return inode ? OVL_I(inode)->oe : NULL;
'ovl_path_type': event 2
Quoted 8 lines
Avoid this by allowing
ovl_dentry_upper()to return NULL ifd_inode()is NULL, as that means the problematic dereferencing can never be reached. Note that this fixes the over-eager compiler warning in an effort to being able to enable -Warray-bounds globally. There is no known behavioral bug here.Suggested-by Amir Goldstein <[email protected]>Signed-off-by Kees Cook <[email protected]>
Applied, thanks.
Miklos