vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fs/zfs: Fix error handling.

Browse source 
Found by: Coverity Scan.
This commit is contained in:
Vladimir Serbinenko 2015-01-27 16:31:35 +01:00
parent 69a52e95d4
commit 0daf46fdbd
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
grub-core/fs/zfs/zfs.c
View file

@ -285,7 +285,7 @@ static const char *spa_feature_names[] = {
static int static int
check_feature(const char *name, grub_uint64_t val, struct grub_zfs_dir_ctx *ctx); check_feature(const char *name, grub_uint64_t val, struct grub_zfs_dir_ctx *ctx);
static int static grub_err_t
check_mos_features(dnode_phys_t *mosmdn_phys,grub_zfs_endian_t endian,struct grub_zfs_data* data ); check_mos_features(dnode_phys_t *mosmdn_phys,grub_zfs_endian_t endian,struct grub_zfs_data* data );
static grub_err_t static grub_err_t
@ -1975,7 +1975,7 @@ dmu_read (dnode_end_t * dn, grub_uint64_t blkid, void **buf,
dn->endian) dn->endian)
<< SPA_MINBLOCKSHIFT; << SPA_MINBLOCKSHIFT;
*buf = grub_malloc (size); *buf = grub_malloc (size);
if (*buf) if (!*buf)
{ {
err = grub_errno; err = grub_errno;
break; break;
@ -3979,7 +3979,12 @@ iterate_zap (const char *name, grub_uint64_t val, struct grub_zfs_dir_ctx *ctx)
dnode_end_t dn; dnode_end_t dn;
grub_memset (&info, 0, sizeof (info)); grub_memset (&info, 0, sizeof (info));
dnode_get (&(ctx->data->subvol.mdn), val, 0, &dn, ctx->data); err = dnode_get (&(ctx->data->subvol.mdn), val, 0, &dn, ctx->data);
if (err)
{
grub_print_error ();
return 0;
}
if (dn.dn.dn_bonustype == DMU_OT_SA) if (dn.dn.dn_bonustype == DMU_OT_SA)
{ {
@ -4200,11 +4205,11 @@ check_feature (const char *name, grub_uint64_t val,
* errnum: Failure. * errnum: Failure.
*/ */
static int static grub_err_t
check_mos_features(dnode_phys_t *mosmdn_phys,grub_zfs_endian_t endian,struct grub_zfs_data* data ) check_mos_features(dnode_phys_t *mosmdn_phys,grub_zfs_endian_t endian,struct grub_zfs_data* data )
{ {
grub_uint64_t objnum; grub_uint64_t objnum;
grub_uint8_t errnum = 0; grub_err_t errnum = 0;
dnode_end_t dn,mosmdn; dnode_end_t dn,mosmdn;
mzap_phys_t* mzp; mzap_phys_t* mzp;
grub_zfs_endian_t endianzap; grub_zfs_endian_t endianzap;