NFS: Use ERR_CAST() to avoid cross-structure cast
When the call to nfs_devname() fails, the error path attempts to retain the error via the mnt variable, but this requires a cast across very different types (char * to struct vfsmount *), which the upcoming structure layout randomization plugin flags as being potentially dangerous in the face of randomization. This is a false positive, but what this code actually wants to do is retain the error value, so this patch explicitly sets it, instead of using what seems to be an unexpected cast. Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Trond Myklebust <trond.myklebust@primarydata.com> Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Родитель
08332893e3
Коммит
fe3b81b446
|
@ -246,7 +246,7 @@ struct vfsmount *nfs_do_submount(struct dentry *dentry, struct nfs_fh *fh,
|
|||
|
||||
devname = nfs_devname(dentry, page, PAGE_SIZE);
|
||||
if (IS_ERR(devname))
|
||||
mnt = (struct vfsmount *)devname;
|
||||
mnt = ERR_CAST(devname);
|
||||
else
|
||||
mnt = nfs_do_clone_mount(NFS_SB(dentry->d_sb), devname, &mountdata);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче