VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

- fixed segmentation fault, ccid running stable now again

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@34 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2010-01-30 11:52:25 +00:00
parent e4424f7316
commit ae067f8d07
2 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
ccid/ccid.c
View File

@@ -257,8 +257,9 @@ int get_rapdu(sc_apdu_t *apdu, size_t slot, __u8 **buf, size_t *resplen)
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_VERBOSE, SC_SUCCESS); SC_FUNC_RETURN(ctx, SC_LOG_TYPE_VERBOSE, SC_SUCCESS);
err: err:
if (apdu->resp) if (apdu->resp) {
free(apdu->resp); free(apdu->resp);
}
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_VERBOSE, sc_result); SC_FUNC_RETURN(ctx, SC_LOG_TYPE_VERBOSE, sc_result);
} }
@@ -345,6 +346,7 @@ get_RDR_to_PC_SlotStatus(__u8 bSlot, __u8 bSeq, int sc_result, RDR_to_PC_SlotSta
RDR_to_PC_SlotStatus_t *result = realloc(*out, sizeof *result); RDR_to_PC_SlotStatus_t *result = realloc(*out, sizeof *result);
if (!result) if (!result)
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_VERBOSE, SC_ERROR_OUT_OF_MEMORY); SC_FUNC_RETURN(ctx, SC_LOG_TYPE_VERBOSE, SC_ERROR_OUT_OF_MEMORY);
*out = result;
result->bMessageType = 0x81; result->bMessageType = 0x81;
result->dwLength = __constant_cpu_to_le32(0); result->dwLength = __constant_cpu_to_le32(0);
@@ -354,8 +356,6 @@ get_RDR_to_PC_SlotStatus(__u8 bSlot, __u8 bSeq, int sc_result, RDR_to_PC_SlotSta
result->bError = get_bError(sc_result); result->bError = get_bError(sc_result);
result->bClockStatus = 0; result->bClockStatus = 0;
*out = result;
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_VERBOSE, SC_SUCCESS); SC_FUNC_RETURN(ctx, SC_LOG_TYPE_VERBOSE, SC_SUCCESS);
} }
@@ -368,6 +368,7 @@ get_RDR_to_PC_DataBlock(__u8 bSlot, __u8 bSeq, int sc_result, RDR_to_PC_DataBloc
RDR_to_PC_DataBlock_t *result = realloc(*out, sizeof *result); RDR_to_PC_DataBlock_t *result = realloc(*out, sizeof *result);
if (!result) if (!result)
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_VERBOSE, SC_ERROR_OUT_OF_MEMORY); SC_FUNC_RETURN(ctx, SC_LOG_TYPE_VERBOSE, SC_ERROR_OUT_OF_MEMORY);
*out = result;
result->bMessageType = 0x80; result->bMessageType = 0x80;
result->dwLength = __constant_cpu_to_le32(0); result->dwLength = __constant_cpu_to_le32(0);
@@ -377,17 +378,18 @@ get_RDR_to_PC_DataBlock(__u8 bSlot, __u8 bSeq, int sc_result, RDR_to_PC_DataBloc
result->bError = get_bError(sc_result); result->bError = get_bError(sc_result);
result->bChainParameter = 0; result->bChainParameter = 0;
*out = result;
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_VERBOSE, SC_SUCCESS); SC_FUNC_RETURN(ctx, SC_LOG_TYPE_VERBOSE, SC_SUCCESS);
} }
int int
perform_PC_to_RDR_GetSlotStatus(const __u8 *in, __u8 **out, size_t *outlen) perform_PC_to_RDR_GetSlotStatus(const __u8 *in, __u8 **out, size_t *outlen)
{ {
int r;
const PC_to_RDR_GetSlotStatus_t *request = (PC_to_RDR_GetSlotStatus_t *) in; const PC_to_RDR_GetSlotStatus_t *request = (PC_to_RDR_GetSlotStatus_t *) in;
RDR_to_PC_SlotStatus_t *result = realloc(*out, sizeof *result); RDR_to_PC_SlotStatus_t *result = realloc(*out, sizeof *result);
int r; if (!result)
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_ERROR, SC_ERROR_OUT_OF_MEMORY);
*out = (__u8 *) result;
if (!out || !outlen) if (!out || !outlen)
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_ERROR, SC_ERROR_INVALID_ARGUMENTS); SC_FUNC_RETURN(ctx, SC_LOG_TYPE_ERROR, SC_ERROR_INVALID_ARGUMENTS);
@@ -403,7 +405,6 @@ perform_PC_to_RDR_GetSlotStatus(const __u8 *in, __u8 **out, size_t *outlen)
r = get_RDR_to_PC_SlotStatus(request->bSlot, request->bSeq, SC_SUCCESS, &result); r = get_RDR_to_PC_SlotStatus(request->bSlot, request->bSeq, SC_SUCCESS, &result);
if (r >= 0) { if (r >= 0) {
*out = (__u8 *) result;
*outlen = sizeof *result; *outlen = sizeof *result;
} }
@@ -416,6 +417,9 @@ perform_PC_to_RDR_IccPowerOn(const __u8 *in, __u8 **out, size_t *outlen)
const PC_to_RDR_IccPowerOn_t *request = (PC_to_RDR_IccPowerOn_t *) in; const PC_to_RDR_IccPowerOn_t *request = (PC_to_RDR_IccPowerOn_t *) in;
int sc_result, r; int sc_result, r;
RDR_to_PC_SlotStatus_t *result = realloc(*out, sizeof *result); RDR_to_PC_SlotStatus_t *result = realloc(*out, sizeof *result);
if (!result)
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_ERROR, SC_ERROR_OUT_OF_MEMORY);
*out = (__u8 *) result;
if ( request->bMessageType != 0x62 || if ( request->bMessageType != 0x62 ||
request->dwLength != __constant_cpu_to_le32(0) || request->dwLength != __constant_cpu_to_le32(0) ||
@@ -445,16 +449,14 @@ perform_PC_to_RDR_IccPowerOn(const __u8 *in, __u8 **out, size_t *outlen)
if (sc_result >= 0) { if (sc_result >= 0) {
result->dwLength = __cpu_to_le32(card_in_slot[request->bSlot]->atr_len); result->dwLength = __cpu_to_le32(card_in_slot[request->bSlot]->atr_len);
*outlen = sizeof *result + card_in_slot[request->bSlot]->atr_len; *outlen = sizeof *result + card_in_slot[request->bSlot]->atr_len;
*out = realloc(result, *outlen); result = realloc(*out, *outlen);
if (!*out) { if (!result)
free(result);
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_ERROR, SC_ERROR_OUT_OF_MEMORY); SC_FUNC_RETURN(ctx, SC_LOG_TYPE_ERROR, SC_ERROR_OUT_OF_MEMORY);
} *out = (__u8 *) result;
memcpy(*out + sizeof *result, card_in_slot[request->bSlot]->atr, card_in_slot[request->bSlot]->atr_len); memcpy(*out + sizeof *result, card_in_slot[request->bSlot]->atr, card_in_slot[request->bSlot]->atr_len);
} else { } else {
debug_sc_result(sc_result); debug_sc_result(sc_result);
*outlen = sizeof *result; *outlen = sizeof *result;
*out = (__u8 *) result;
} }
} }
@@ -500,9 +502,12 @@ perform_PC_to_RDR_XfrBlock(const u8 *in, __u8** out, size_t *outlen)
size_t resplen = 0; size_t resplen = 0;
sc_apdu_t apdu; sc_apdu_t apdu;
const PC_to_RDR_XfrBlock_t *request = (PC_to_RDR_XfrBlock_t *) in; const PC_to_RDR_XfrBlock_t *request = (PC_to_RDR_XfrBlock_t *) in;
RDR_to_PC_DataBlock_t *result = realloc(*out, sizeof *result);
const __u8 *abDataIn = in + sizeof *request; const __u8 *abDataIn = in + sizeof *request;
__u8 *abDataOut; __u8 *abDataOut;
RDR_to_PC_DataBlock_t *result = realloc(*out, sizeof *result);
if (!result)
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_ERROR, SC_ERROR_OUT_OF_MEMORY);
*out = (__u8 *) result;
if ( request->bMessageType != 0x6F || if ( request->bMessageType != 0x6F ||
request->bBWI != 0) request->bBWI != 0)
@@ -520,15 +525,15 @@ perform_PC_to_RDR_XfrBlock(const u8 *in, __u8** out, size_t *outlen)
if (r >= 0) { if (r >= 0) {
*outlen = sizeof *result + resplen; *outlen = sizeof *result + resplen;
*out = realloc(result, *outlen); result = realloc(*out, *outlen);
if (!*out) { if (!result) {
free(abDataOut); free(abDataOut);
sc_result = SC_ERROR_OUT_OF_MEMORY; sc_result = SC_ERROR_OUT_OF_MEMORY;
result->bError = get_bError(sc_result); result->bError = get_bError(sc_result);
result->bStatus = get_bStatus(sc_result, request->bSlot); result->bStatus = get_bStatus(sc_result, request->bSlot);
*outlen = sizeof *result; *outlen = sizeof *result;
*out = (__u8 *) result;
} else { } else {
*out = (__u8 *) result;
result->dwLength = __cpu_to_le32(resplen); result->dwLength = __cpu_to_le32(resplen);
memcpy(*out + sizeof *result, abDataOut, resplen); memcpy(*out + sizeof *result, abDataOut, resplen);
} }
@@ -563,6 +568,7 @@ perform_PC_to_RDR_GetParamters(const __u8 *in, __u8** out, size_t *outlen)
result = realloc(*out, sizeof *result + sizeof *t0); result = realloc(*out, sizeof *result + sizeof *t0);
if (!result) if (!result)
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_ERROR, SC_ERROR_OUT_OF_MEMORY); SC_FUNC_RETURN(ctx, SC_LOG_TYPE_ERROR, SC_ERROR_OUT_OF_MEMORY);
*out = (__u8 *) result;
result->bProtocolNum = 0; result->bProtocolNum = 0;
result->dwLength = __constant_cpu_to_le32(sizeof *t0); result->dwLength = __constant_cpu_to_le32(sizeof *t0);
@@ -585,6 +591,7 @@ perform_PC_to_RDR_GetParamters(const __u8 *in, __u8** out, size_t *outlen)
result = realloc(*out, sizeof *result + sizeof *t1); result = realloc(*out, sizeof *result + sizeof *t1);
if (!result) if (!result)
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_ERROR, SC_ERROR_OUT_OF_MEMORY); SC_FUNC_RETURN(ctx, SC_LOG_TYPE_ERROR, SC_ERROR_OUT_OF_MEMORY);
*out = (__u8 *) result;
result->bProtocolNum = 1; result->bProtocolNum = 1;
result->dwLength = __constant_cpu_to_le32(sizeof *t1); result->dwLength = __constant_cpu_to_le32(sizeof *t1);
@@ -614,6 +621,7 @@ perform_PC_to_RDR_GetParamters(const __u8 *in, __u8** out, size_t *outlen)
result = realloc(*out, sizeof *result); result = realloc(*out, sizeof *result);
if (!result) if (!result)
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_ERROR, SC_ERROR_OUT_OF_MEMORY); SC_FUNC_RETURN(ctx, SC_LOG_TYPE_ERROR, SC_ERROR_OUT_OF_MEMORY);
*out = (__u8 *) result;
sc_result = SC_ERROR_INVALID_DATA; sc_result = SC_ERROR_INVALID_DATA;
} }
@@ -786,7 +794,6 @@ write_pin(sc_apdu_t *apdu, struct sc_pin_cmd_pin *pin, uint8_t blocksize,
int int
perform_PC_to_RDR_Secure(const __u8 *in, __u8** out, size_t *outlen) perform_PC_to_RDR_Secure(const __u8 *in, __u8** out, size_t *outlen)
{ {
RDR_to_PC_DataBlock_t *result = realloc(*out, sizeof *result);
int sc_result, r; int sc_result, r;
sc_apdu_t apdu; sc_apdu_t apdu;
struct sc_pin_cmd_pin curr_pin, new_pin; struct sc_pin_cmd_pin curr_pin, new_pin;
@@ -795,6 +802,10 @@ perform_PC_to_RDR_Secure(const __u8 *in, __u8** out, size_t *outlen)
const __u8* abData = in + sizeof *request; const __u8* abData = in + sizeof *request;
u8 *abDataOut; u8 *abDataOut;
size_t resplen = 0; size_t resplen = 0;
RDR_to_PC_DataBlock_t *result = realloc(*out, sizeof *result);
if (!result)
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_ERROR, SC_ERROR_OUT_OF_MEMORY);
*out = (__u8 *) result;
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
memset(&curr_pin, 0, sizeof(curr_pin)); memset(&curr_pin, 0, sizeof(curr_pin));
@@ -979,8 +990,9 @@ err:
*outlen = sizeof *result + resplen; *outlen = sizeof *result + resplen;
*out = realloc(result, *outlen); *out = realloc(result, *outlen);
if (!*out) { if (!*out) {
if (abDataOut) if (abDataOut) {
free(abDataOut); free(abDataOut);
}
sc_result = SC_ERROR_OUT_OF_MEMORY; sc_result = SC_ERROR_OUT_OF_MEMORY;
result->bError = get_bError(sc_result); result->bError = get_bError(sc_result);
result->bStatus = get_bStatus(sc_result, request->bSlot); result->bStatus = get_bStatus(sc_result, request->bSlot);
@@ -1023,6 +1035,7 @@ get_RDR_to_PC_NotifySlotChange(RDR_to_PC_NotifySlotChange_t **out)
RDR_to_PC_NotifySlotChange_t *result = realloc(*out, sizeof *result); RDR_to_PC_NotifySlotChange_t *result = realloc(*out, sizeof *result);
if (!result) if (!result)
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_VERBOSE, SC_ERROR_OUT_OF_MEMORY); SC_FUNC_RETURN(ctx, SC_LOG_TYPE_VERBOSE, SC_ERROR_OUT_OF_MEMORY);
*out = result;
result->bMessageType = 0x50; result->bMessageType = 0x50;
result->bmSlotICCState = CCID_SLOTS_UNCHANGED; result->bmSlotICCState = CCID_SLOTS_UNCHANGED;
@@ -1053,6 +1066,7 @@ perform_unknown(const __u8 *in, __u8 **out, size_t *outlen)
RDR_to_PC_SlotStatus_t *result = realloc(*out, sizeof *result); RDR_to_PC_SlotStatus_t *result = realloc(*out, sizeof *result);
if (!result) if (!result)
SC_FUNC_RETURN(ctx, SC_LOG_TYPE_ERROR, SC_ERROR_OUT_OF_MEMORY); SC_FUNC_RETURN(ctx, SC_LOG_TYPE_ERROR, SC_ERROR_OUT_OF_MEMORY);
*out = (__u8 *) result;
switch (request->bMessageType) { switch (request->bMessageType) {
case 0x62: case 0x62:
@@ -1151,6 +1165,7 @@ int ccid_parse_control(struct usb_ctrlrequest *setup, __u8 **outbuf)
{ {
int result = -1; int result = -1;
__u16 value, index, length; __u16 value, index, length;
__u8 *tmp;
value = __le16_to_cpu(setup->wValue); value = __le16_to_cpu(setup->wValue);
index = __le16_to_cpu(setup->wIndex); index = __le16_to_cpu(setup->wIndex);
@@ -1173,11 +1188,12 @@ int ccid_parse_control(struct usb_ctrlrequest *setup, __u8 **outbuf)
} }
result = sizeof(__le32); result = sizeof(__le32);
*outbuf = realloc(*outbuf, result); tmp = realloc(*outbuf, result);
if (*outbuf == NULL) { if (tmp == NULL) {
result = -1; result = -1;
break; break;
} }
*outbuf = tmp;
__le32 clock = ccid_desc.dwDefaultClock; __le32 clock = ccid_desc.dwDefaultClock;
memcpy(*outbuf, &clock, sizeof (__le32)); memcpy(*outbuf, &clock, sizeof (__le32));
} break; } break;
@@ -1189,11 +1205,12 @@ int ccid_parse_control(struct usb_ctrlrequest *setup, __u8 **outbuf)
} }
result = sizeof (__le32); result = sizeof (__le32);
*outbuf = realloc(*outbuf, result); tmp = realloc(*outbuf, result);
if (*outbuf == NULL) { if (tmp == NULL) {
result = -1; result = -1;
break; break;
} }
*outbuf = tmp;
__le32 drate = ccid_desc.dwDataRate; __le32 drate = ccid_desc.dwDataRate;
memcpy(*outbuf, &drate, sizeof (__le32)); memcpy(*outbuf, &drate, sizeof (__le32));
} break; } break;

2
ccid/usb.c
View File

@@ -1496,8 +1496,6 @@ special:
result = write (fd, outbuf, result); result = write (fd, outbuf, result);
if (debug) if (debug)
fprintf(stderr, "done.\n"); fprintf(stderr, "done.\n");
free(outbuf);
outbuf = NULL; // XXX
if (result < 0) if (result < 0)
goto stall; goto stall;
} return; } return;