Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/invalid free ahandle #28010

Open
wants to merge 2 commits into
base: 3.1
Choose a base branch
from
Open

Fix/invalid free ahandle #28010

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d3c8e6
fix invalid read
yihaoDeng Sep 20, 2024
12fae85
fix invalid read
yihaoDeng Sep 20, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix invalid read
  • Loading branch information
@yihaoDeng
yihaoDeng committed Sep 20, 2024
commit 12fae85f02ca8eab0f6211b77150f1cbfca0af95
8 changes: 4 additions & 4 deletions source/client/src/clientImpl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2161,10 +2161,10 @@ TSDB_SERVER_STATUS taos_check_server_status(const char* fqdn, int port, char* de
void* clientRpc = NULL;
SServerStatusRsp statusRsp = {0};
SEpSet epSet = {.inUse = 0, .numOfEps = 1};
SRpcMsg rpcMsg = {.info.ahandle = (void*)0x9527, .msgType = TDMT_DND_SERVER_STATUS};
SRpcMsg rpcRsp = {0};
SRpcInit rpcInit = {0};
char pass[TSDB_PASSWORD_LEN + 1] = {0};
SRpcMsg rpcMsg = {.info.ahandle = (void*)0x9527, .info.notFreeAhandle = 1, .msgType = TDMT_DND_SERVER_STATUS};
SRpcMsg rpcRsp = {0};
SRpcInit rpcInit = {0};
char pass[TSDB_PASSWORD_LEN + 1] = {0};

rpcInit.label = "CHK";
rpcInit.numOfThreads = 1;
Expand Down
3 changes: 3 additions & 0 deletions source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ static void dmMayShouldUpdateIpWhiteList(SDnodeMgmt *pMgmt, int64_t ver) {
.contLen = contLen,
.msgType = TDMT_MND_RETRIEVE_IP_WHITE,
.info.ahandle = (void *)0x9527,
.info.notFreeAhandle = 1,
.info.refId = 0,
.info.noResp = 0};
SEpSet epset = {0};
Expand Down Expand Up @@ -165,6 +166,7 @@ void dmSendStatusReq(SDnodeMgmt *pMgmt) {
.contLen = contLen,
.msgType = TDMT_MND_STATUS,
.info.ahandle = (void *)0x9527,
.info.notFreeAhandle = 1,
.info.refId = 0,
.info.noResp = 0,
.info.handle = 0};
Expand Down Expand Up @@ -198,6 +200,7 @@ void dmSendNotifyReq(SDnodeMgmt *pMgmt, SNotifyReq *pReq) {
.contLen = contLen,
.msgType = TDMT_MND_NOTIFY,
.info.ahandle = (void *)0x9527,
.info.notFreeAhandle = 1,
.info.refId = 0,
.info.noResp = 1,
.info.handle = 0};
Expand Down
14 changes: 10 additions & 4 deletions source/dnode/mnode/impl/src/mndMain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,11 @@ static void mndPullupGrant(SMnode *pMnode) {
int32_t contLen = 0;
void *pReq = mndBuildTimerMsg(&contLen);
if (pReq != NULL) {
SRpcMsg rpcMsg = {
.msgType = TDMT_MND_GRANT_HB_TIMER, .pCont = pReq, .contLen = contLen, .info.ahandle = (void *)0x9527};
SRpcMsg rpcMsg = {.msgType = TDMT_MND_GRANT_HB_TIMER,
.pCont = pReq,
.contLen = contLen,
.info.notFreeAhandle = 1,
.info.ahandle = (void *)0x9527};
tmsgPutToQueue(&pMnode->msgCb, READ_QUEUE, &rpcMsg);
}
}
Expand All @@ -192,8 +195,11 @@ static void mndIncreaseUpTime(SMnode *pMnode) {
int32_t contLen = 0;
void *pReq = mndBuildTimerMsg(&contLen);
if (pReq != NULL) {
SRpcMsg rpcMsg = {
.msgType = TDMT_MND_UPTIME_TIMER, .pCont = pReq, .contLen = contLen, .info.ahandle = (void *)0x9527};
SRpcMsg rpcMsg = {.msgType = TDMT_MND_UPTIME_TIMER,
.pCont = pReq,
.contLen = contLen,
.info.notFreeAhandle = 1,
.info.ahandle = (void *)0x9527};
tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg);
}
}
Expand Down