Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-21 14:59:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fs/zfs/zfs: Pass pointer to dnode_end_t instead of value to fill_fs_info()

Browse Source 
Coverity reports that dnode_end_t argument of fill_fs_info() is too
large to pass-by-value. Therefore, replace the argument with a pointer.

Fixes: CID 73631

Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Jagannathan Raman authored and Daniel Kiper committed 2022-08-19 23:55:50 +02:00
1 parent de6921ced3
commit a032782c86
1 file changed
+13 -4
Download Patch File Download Diff File Expand all files Collapse all files
grub-core/fs/zfs/zfs.c
+13 -4
View File
@@ -3983,14 +3983,23 @@ grub_zfs_getmdnobj (grub_device_t dev, const char *fsfilename,
return err; return err;
} }
/*
* Note: fill_fs_info() uses functions such as make_mdn() that modify
* the input dnode_end_t parameter. However, we should not allow it.
* Therefore, we are making mdn_in constant - fill_fs_info() makes
* a local copy of it.
*/
static grub_err_t static grub_err_t
fill_fs_info (struct grub_dirhook_info *info, fill_fs_info (struct grub_dirhook_info *info,
dnode_end_t mdn, struct grub_zfs_data *data) const dnode_end_t *mdn_in, struct grub_zfs_data *data)
{ {
grub_err_t err; grub_err_t err;
dnode_end_t dn; dnode_end_t dn;
grub_uint64_t objnum; grub_uint64_t objnum;
grub_uint64_t headobj; grub_uint64_t headobj;
dnode_end_t mdn;
grub_memcpy (&mdn, mdn_in, sizeof (*mdn_in));
grub_memset (info, 0, sizeof (*info)); grub_memset (info, 0, sizeof (*info));
@@ -4148,7 +4157,7 @@ iterate_zap_fs (const char *name, grub_uint64_t val,
if (mdn.dn.dn_type != DMU_OT_DSL_DIR) if (mdn.dn.dn_type != DMU_OT_DSL_DIR)
return 0; return 0;
err = fill_fs_info (&info, mdn, ctx->data); err = fill_fs_info (&info, &mdn, ctx->data);
if (err) if (err)
{ {
grub_errno = 0; grub_errno = 0;
@@ -4179,7 +4188,7 @@ iterate_zap_snap (const char *name, grub_uint64_t val,
if (mdn.dn.dn_type != DMU_OT_DSL_DATASET) if (mdn.dn.dn_type != DMU_OT_DSL_DATASET)
return 0; return 0;
err = fill_fs_info (&info, mdn, ctx->data); err = fill_fs_info (&info, &mdn, ctx->data);
if (err) if (err)
{ {
grub_errno = 0; grub_errno = 0;
@@ -4224,7 +4233,7 @@ grub_zfs_dir (grub_device_t device, const char *path,
dnode_end_t dn; dnode_end_t dn;
struct grub_dirhook_info info; struct grub_dirhook_info info;
err = fill_fs_info (&info, data->dnode, data); err = fill_fs_info (&info, &data->dnode, data);
if (err) if (err)
{ {
zfs_unmount (data); zfs_unmount (data);