c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-04-06 17:49:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix coverity defects: CID 147548

Browse Source 
CID 147548: Type:Dereference null return value

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: cao.xuewen <cao.xuewen@zte.com.cn>
Closes #5321
This commit is contained in:
cao 2016-11-01 07:56:10 +08:00 committed by Brian Behlendorf
parent b182ac00aa
commit 2bac68145f
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sys/fs/zfs.h
View File

@ -917,6 +917,7 @@ typedef struct ddt_histogram {
#define ZVOL_DRIVER "zvol" #define ZVOL_DRIVER "zvol"
#define ZFS_DRIVER "zfs" #define ZFS_DRIVER "zfs"
#define ZFS_DEV "/dev/zfs" #define ZFS_DEV "/dev/zfs"
#define ZFS_SHARETAB "/etc/dfs/sharetab"
/* general zvol path */ /* general zvol path */
#define ZVOL_DIR "/dev" #define ZVOL_DIR "/dev"

6
lib/libshare/libshare.c
View File

@ -113,7 +113,7 @@ parse_sharetab(sa_handle_impl_t impl_handle) {
char line[512]; char line[512];
char *eol, *pathname, *resource, *fstype, *options, *description; char *eol, *pathname, *resource, *fstype, *options, *description;
fp = fopen("/etc/dfs/sharetab", "r"); fp = fopen(ZFS_SHARETAB, "r");
if (fp == NULL) if (fp == NULL)
return; return;
@ -170,7 +170,7 @@ update_sharetab(sa_handle_impl_t impl_handle)
sa_share_impl_t impl_share; sa_share_impl_t impl_share;
int temp_fd; int temp_fd;
FILE *temp_fp; FILE *temp_fp;
char tempfile[] = "/etc/dfs/sharetab.XXXXXX"; char tempfile[] = ZFS_SHARETAB".XXXXXX";
sa_fstype_t *fstype; sa_fstype_t *fstype;
const char *resource; const char *resource;
@ -215,7 +215,7 @@ update_sharetab(sa_handle_impl_t impl_handle)
fsync(temp_fd); fsync(temp_fd);
fclose(temp_fp); fclose(temp_fp);
(void) rename(tempfile, "/etc/dfs/sharetab"); (void) rename(tempfile, ZFS_SHARETAB);
} }
typedef struct update_cookie_s { typedef struct update_cookie_s {

5
lib/libzfs/libzfs_util.c
View File

@ -863,12 +863,13 @@ libzfs_init(void)
return (NULL); return (NULL);
} }
hdl->libzfs_sharetab = fopen("/etc/dfs/sharetab", "r"); hdl->libzfs_sharetab = fopen(ZFS_SHARETAB, "r");
if (libzfs_core_init() != 0) { if (libzfs_core_init() != 0) {
(void) close(hdl->libzfs_fd); (void) close(hdl->libzfs_fd);
(void) fclose(hdl->libzfs_mnttab); (void) fclose(hdl->libzfs_mnttab);
(void) fclose(hdl->libzfs_sharetab); if (hdl->libzfs_sharetab)
(void) fclose(hdl->libzfs_sharetab);
free(hdl); free(hdl);
return (NULL); return (NULL);
} }