giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

goid-tool: fixed possible memory leak 

internally created context needs to be freed if TA/CA is done without
an existing SM context from PACE
This commit is contained in:
Frank Morgner 2019-02-11 14:33:23 +01:00
parent 72cdc9d82e
commit be33e82b75
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/sm/sm-eac.c
View File

@ -1499,6 +1499,16 @@ err:
return r;
}
static void eac_sm_clear_free_without_ctx(const struct iso_sm_ctx *ctx)
{
if (ctx) {
struct eac_sm_ctx *eacsmctx = ctx->priv_data;
if (eacsmctx)
eacsmctx->ctx = NULL;
eac_sm_clear_free(ctx);
}
}
#define TA_NONCE_LENGTH 8
int perform_terminal_authentication(sc_card_t *card,
const unsigned char **certs, const size_t *certs_lens,
@ -1521,6 +1531,7 @@ int perform_terminal_authentication(sc_card_t *card,
}
if (!card->sm_ctx.info.cmd_data) {
card->sm_ctx.info.cmd_data = iso_sm_ctx_create();
card->sm_ctx.ops.close = iso_sm_close;
}
if (!card->sm_ctx.info.cmd_data) {
r = SC_ERROR_INTERNAL;
@ -1559,6 +1570,10 @@ int perform_terminal_authentication(sc_card_t *card,
r = SC_ERROR_INTERNAL;
goto err;
}
/* when iso_sm_ctx_clear_free is called, we want everything to be freed
* except the EAC_CTX, because it is needed for performing SM *after*
* iso_sm_start was called. */
isosmctx->clear_free = eac_sm_clear_free_without_ctx;
eac_ctx = NULL;
}
eacsmctx = isosmctx->priv_data;

2
src/sm/sm-iso.h
View File

@ -119,6 +119,8 @@ struct iso_sm_ctx *iso_sm_ctx_create(void);
*/
int iso_sm_start(struct sc_card *card, struct iso_sm_ctx *sctx);
int iso_sm_close(struct sc_card *card);
#ifdef __cplusplus
}
#endif