Fix minor coding style issues in MCAP CSP code
PATCH 1/2 Fix minor coding style issues in MCAP CSP code
--- health/mcap_sync.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-)
health/mcap_sync.c +9 -13
@@ -590,9 +590,9 @@ static void proc_sync_set_req(struct mcap_mcl *mcl, uint8_t *cmd, uint32_t len)return ; } -if (sched_btclock ==MCAP_BTCLOCK_IMMEDIATE ) { +if (sched_btclock ==MCAP_BTCLOCK_IMMEDIATE ) phase2_delay =0 ; - }else { +else { phase2_delay =btdiff (cur_btclock, sched_btclock);if (phase2_delay <0 ) {
@@ -631,9 +631,8 @@ static void proc_sync_set_req(struct mcap_mcl *mcl, uint8_t *cmd, uint32_t len) }DBG ("CSP: indication every %dms" , ind_freq); - }else { + }else ind_freq =0 ; - }if (mcl->csp->ind_timer) {/* Old indications are no longer sent */
@@ -661,14 +660,12 @@ static void proc_sync_set_req(struct mcap_mcl *mcl, uint8_t *cmd, uint32_t len) mcl->csp->set_timer =g_timeout_add (when, proc_sync_set_req_phase2, mcl); - }else { + }else proc_sync_set_req_phase2 (mcl); - }/* First indication is immediate */ -if (update) { +if (update)sync_send_indication (mcl); - } } static gboolean get_all_clocks(struct mcap_mcl *mcl, uint32_t *btclock,
@@ -749,11 +746,10 @@ static gboolean proc_sync_set_req_phase2(gpointer user_data)if (delay >=0 || ((new_tmstamp - delay) >0 )) { new_tmstamp += delay;DBG ("CSP: reset w/ delay %dus, compensated" , - delay); - }else { + delay); + }else DBG ("CSP: reset w/ delay %dus, uncompensated" , - delay); - } + delay); }reset_tmstamp (mcl->csp, &base_time, new_tmstamp);
@@ -860,7 +856,7 @@ static void proc_sync_cap_rsp(struct mcap_mcl *mcl, uint8_t *cmd, uint32_t len) mcl->csp->local_caps = TRUE;cb (mcl, mcap_err, btclockres, synclead, tmstampres, tmstampacc,NULL , - user_data); + user_data); }static void proc_sync_set_rsp (struct mcap_mcl *mcl,uint8_t *cmd,uint32_t len)
Signature · 1 line
1.7.0.4
PATCH 2/2 Fix potential NULL pointer access in MCAP CSP code
NULL pointer acces may hapen when an attemp to send a synchronization command happens over a closed MCL.
--- health/mcap_sync.c | 43 ++++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 21 deletions(-)
health/mcap_sync.c +22 -21
@@ -80,17 +80,27 @@ static inline uint64_t ntoh64(uint64_t n)#define hton64 (x) ntoh64(x) +static int send_sync_cmd (struct mcap_mcl *mcl,const void *buf,uint32_t size) +{ +int sock; + +if (mcl->cc ==NULL ) +return -1 ; + + sock =g_io_channel_unix_get_fd (mcl->cc); +return mcap_send_data (sock, buf, size); +} +static int send_unsupported_cap_req (struct mcap_mcl *mcl) {mcap_md_sync_cap_rsp *cmd; -int sock, sent; +int sent; cmd =g_new0 (mcap_md_sync_cap_rsp,1 ); cmd->op =MCAP_MD_SYNC_CAP_RSP ; cmd->rc =MCAP_REQUEST_NOT_SUPPORTED ; - sock =g_io_channel_unix_get_fd (mcl->cc); - sent =mcap_send_data (sock, cmd,sizeof (*cmd)); + sent =send_sync_cmd (mcl, cmd,sizeof (*cmd));g_free (cmd);return sent;
@@ -99,14 +109,13 @@ static int send_unsupported_cap_req(struct mcap_mcl *mcl)static int send_unsupported_set_req (struct mcap_mcl *mcl) {mcap_md_sync_set_rsp *cmd; -int sock, sent; +int sent; cmd =g_new0 (mcap_md_sync_set_rsp,1 ); cmd->op =MCAP_MD_SYNC_SET_RSP ; cmd->rc =MCAP_REQUEST_NOT_SUPPORTED ; - sock =g_io_channel_unix_get_fd (mcl->cc); - sent =mcap_send_data (sock, cmd,sizeof (*cmd)); + sent =send_sync_cmd (mcl, cmd,sizeof (*cmd));g_free (cmd);return sent;
@@ -457,7 +466,6 @@ static int send_sync_cap_rsp(struct mcap_mcl *mcl, uint8_t rspcode, {mcap_md_sync_cap_rsp *rsp;int sent; -int sock; rsp =g_new0 (mcap_md_sync_cap_rsp,1 );
@@ -469,8 +477,7 @@ static int send_sync_cap_rsp(struct mcap_mcl *mcl, uint8_t rspcode, rsp->timestnr =htons (tmstampres); rsp->timestna =htons (tmstampacc); - sock =g_io_channel_unix_get_fd (mcl->cc); - sent =mcap_send_data (sock, rsp,sizeof (*rsp)); + sent =send_sync_cmd (mcl, rsp,sizeof (*rsp));g_free (rsp);return sent;
@@ -519,7 +526,7 @@ static int send_sync_set_rsp(struct mcap_mcl *mcl, uint8_t rspcode, uint16_t tmstampres) {mcap_md_sync_set_rsp *rsp; -int sock, sent; +int sent; rsp =g_new0 (mcap_md_sync_set_rsp,1 );
@@ -529,8 +536,7 @@ static int send_sync_set_rsp(struct mcap_mcl *mcl, uint8_t rspcode, rsp->timestst =hton64 (timestamp); rsp->timestsa =htons (tmstampres); - sock =g_io_channel_unix_get_fd (mcl->cc); - sent =mcap_send_data (sock, rsp,sizeof (*rsp)); + sent =send_sync_cmd (mcl, rsp,sizeof (*rsp));g_free (rsp);return sent;
@@ -786,7 +792,7 @@ static gboolean sync_send_indication(gpointer user_data)uint32_t btclock;uint64_t tmstamp;struct timespec base_time; -int sock, sent; +int sent;if (!user_data)return FALSE;
@@ -803,8 +809,7 @@ static gboolean sync_send_indication(gpointer user_data) cmd->timestst =hton64 (tmstamp); cmd->timestsa =htons (caps (mcl)->latency); - sock =g_io_channel_unix_get_fd (mcl->cc); - sent =mcap_send_data (sock, cmd,sizeof (*cmd)); + sent =send_sync_cmd (mcl, cmd,sizeof (*cmd));g_free (cmd);return !sent;
@@ -940,7 +945,6 @@ void mcap_sync_cap_req(struct mcap_mcl *mcl, uint16_t reqacc, {struct mcap_sync_cap_cbdata *cbdata;mcap_md_sync_cap_req *cmd; -int sock;if (!mcl->ms->csp_enabled || !mcl->csp) { g_set_error(err,
@@ -969,8 +973,7 @@ void mcap_sync_cap_req(struct mcap_mcl *mcl, uint16_t reqacc, cbdata->user_data = user_data; mcl->csp->csp_priv_data = cbdata; - sock =g_io_channel_unix_get_fd (mcl->cc); -mcap_send_data (sock, cmd,sizeof (*cmd)); +send_sync_cmd (mcl, cmd,sizeof (*cmd));g_free (cmd); }
@@ -981,7 +984,6 @@ void mcap_sync_set_req(struct mcap_mcl *mcl, uint8_t update, uint32_t btclock, {mcap_md_sync_set_req *cmd;struct mcap_sync_set_cbdata *cbdata; -int sock;if (!mcl->ms->csp_enabled || !mcl->csp) { g_set_error(err,
@@ -1022,8 +1024,7 @@ void mcap_sync_set_req(struct mcap_mcl *mcl, uint8_t update, uint32_t btclock, cbdata->user_data = user_data; mcl->csp->csp_priv_data = cbdata; - sock =g_io_channel_unix_get_fd (mcl->cc); -mcap_send_data (sock, cmd,sizeof (*cmd)); +send_sync_cmd (mcl, cmd,sizeof (*cmd));g_free (cmd); }
Signature · 1 line
1.7.0.4
Re: [PATCH 2/2] Fix potential NULL pointer access in MCAP CSP code
Hi,
Quoted 5 lines · Santiago Carot-Nemesio
NULL pointer acces may hapen when an attemp to send a synchronization command happens over a closed MCL.
--- health/mcap_sync.c | 43 ++++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 21 deletions(-)
Thanks. This patch is also now upstream.
Johan
Hi,
Quoted 3 lines · Santiago Carot-Nemesio
--- health/mcap_sync.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-)
Thanks for the patch. It's now upstream.
Johan