TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

um: Remove some unnecessary NULL checks in vector_user.c

Browse Source 
kfree() already checks for null pointers, so additional checking is
unnecessary.

Signed-off-by: Alex Dewar <alex.dewar@gmx.co.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Alex Dewar
2020-03-27 19:36:25 +00:00
committed by Richard Weinberger
parent 237ce2e681
commit 4a7c46247f
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/um/drivers/vector_user.c
+5 -10
View File
@@ -221,8 +221,7 @@ static struct vector_fds *user_init_tap_fds(struct arglist *ifspec)
return result; return result;
tap_cleanup: tap_cleanup:
printk(UM_KERN_ERR "user_init_tap: init failed, error %d", fd); printk(UM_KERN_ERR "user_init_tap: init failed, error %d", fd);
if (result != NULL) kfree(result);
kfree(result);
return NULL; return NULL;
} }
@@ -266,8 +265,7 @@ static struct vector_fds *user_init_hybrid_fds(struct arglist *ifspec)
return result; return result;
hybrid_cleanup: hybrid_cleanup:
printk(UM_KERN_ERR "user_init_hybrid: init failed"); printk(UM_KERN_ERR "user_init_hybrid: init failed");
if (result != NULL) kfree(result);
kfree(result);
return NULL; return NULL;
} }
@@ -344,10 +342,8 @@ static struct vector_fds *user_init_unix_fds(struct arglist *ifspec, int id)
unix_cleanup: unix_cleanup:
if (fd >= 0) if (fd >= 0)
os_close_file(fd); os_close_file(fd);
if (remote_addr != NULL) kfree(remote_addr);
kfree(remote_addr); kfree(result);
if (result != NULL)
kfree(result);
return NULL; return NULL;
} }
@@ -382,8 +378,7 @@ static struct vector_fds *user_init_raw_fds(struct arglist *ifspec)
return result; return result;
raw_cleanup: raw_cleanup:
printk(UM_KERN_ERR "user_init_raw: init failed, error %d", err); printk(UM_KERN_ERR "user_init_raw: init failed, error %d", err);
if (result != NULL) kfree(result);
kfree(result);
return NULL; return NULL;
} }