andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

features/bit-rot: NULL pointer deferencing clang fix

Browse Source 
Problem: local could be NULL

Added condition checks to address this issue

Updates: bz#1622665

Change-Id: I7be7dacc5386a77441385240b43f22d85074b69d
Signed-off-by: Sheetal Pamecha <sheetal.pamecha08@gmail.com>
This commit is contained in:
Sheetal Pamecha 2018-10-01 17:02:09 +05:30 committed by Kotresh HR
parent 6a67094895
commit 1d392e2970
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xlators/features/bit-rot/src/stub/bit-rot-stub-messages.h
View File

@ -39,6 +39,6 @@ GLFS_MSGID(BITROT_STUB, BRS_MSG_NO_MEMORY, BRS_MSG_SET_EVENT_FAILED,
BRS_MSG_BAD_HANDLE_DIR_NULL, BRS_MSG_BAD_OBJ_THREAD_FAIL,
BRS_MSG_BAD_OBJ_DIR_CLOSE_FAIL, BRS_MSG_LINK_FAIL,
BRS_MSG_BAD_OBJ_UNLINK_FAIL, BRS_MSG_DICT_SET_FAILED,
BRS_MSG_PATH_GET_FAILED);
BRS_MSG_PATH_GET_FAILED, BRS_MSG_NULL_LOCAL);
#endif /* !_BITROT_STUB_MESSAGES_H_ */

16
xlators/features/bit-rot/src/stub/bit-rot-stub.c
View File

@ -1588,6 +1588,11 @@ br_stub_getxattr_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
local = frame->local;
frame->local = NULL;
if (!local) {
op_ret = -1;
op_errno = EINVAL;
goto unwind;
}
inode = local->u.context.inode;
op_ret = -1;
@ -1654,10 +1659,8 @@ delkeys:
unwind:
STACK_UNWIND_STRICT(getxattr, frame, op_ret, op_errno, xattr, xdata);
if (local) {
br_stub_cleanup_local(local);
br_stub_dealloc_local(local);
}
br_stub_cleanup_local(local);
br_stub_dealloc_local(local);
return 0;
}
@ -3086,6 +3089,11 @@ br_stub_unlink_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
if (op_ret < 0)
goto unwind;
if (!local) {
gf_msg(this->name, GF_LOG_WARNING, 0, BRS_MSG_NULL_LOCAL,
"local is NULL");
goto unwind;
}
inode = local->u.context.inode;
if (!IA_ISREG(inode->ia_type))
goto unwind;