github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

reveng mem leaks

Browse source
This commit is contained in:
iceman1001 2020-10-06 17:14:10 +02:00
commit 4eb11f470d
2 changed files with 51 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

42
client/deps/reveng/cli.c
View file

@ -167,8 +167,9 @@ int reveng_main(int argc, char *argv[]) {
pkchop(&model.spoly); pkchop(&model.spoly);
width = plen(model.spoly); width = plen(model.spoly);
rflags |= R_HAVEP; rflags |= R_HAVEP;
if (c == 'P') if (c == 'P') {
prcp(&model.spoly); prcp(&model.spoly);
}
mnovel(&model); mnovel(&model);
break; break;
case 'l': /* l little-endian input and output */ case 'l': /* l little-endian input and output */
@ -332,6 +333,7 @@ ipqx:
mbynum(&model, --args); mbynum(&model, --args);
ufound(&model); ufound(&model);
} while (args); } while (args);
mfree(&model);
break; break;
case 'd': /* d dump CRC model */ case 'd': /* d dump CRC model */
/* maybe we don't want to do this: /* maybe we don't want to do this:
@ -387,6 +389,10 @@ ipqx:
apolys = calloc(args * sizeof(poly_t), sizeof(char)); apolys = calloc(args * sizeof(poly_t), sizeof(char));
if (!apolys) { if (!apolys) {
uerror("cannot allocate memory for argument list"); uerror("cannot allocate memory for argument list");
pfree(&model.spoly);
pfree(&model.init);
pfree(&model.xorout);
mfree(&model);
return 0; return 0;
} }
@ -421,16 +427,20 @@ ipqx:
continue; continue;
if (rflags & R_HAVEX && psncmp(&model.xorout, &pset.xorout)) if (rflags & R_HAVEX && psncmp(&model.xorout, &pset.xorout))
continue; continue;
apoly = pclone(pset.xorout); apoly = pclone(pset.xorout);
if (pset.flags & P_REFOUT) if (pset.flags & P_REFOUT) {
prev(&apoly); prev(&apoly);
}
for (qptr = apolys; qptr < pptr; ++qptr) { for (qptr = apolys; qptr < pptr; ++qptr) {
crc = pcrc(*qptr, pset.spoly, pset.init, apoly, 0); crc = pcrc(*qptr, pset.spoly, pset.init, apoly, 0);
if (ptst(crc)) { if (ptst(crc)) {
pfree(&crc); pfree(&crc);
break; break;
} else } else {
pfree(&crc); pfree(&crc);
}
} }
pfree(&apoly); pfree(&apoly);
if (qptr == pptr) { if (qptr == pptr) {
@ -444,14 +454,19 @@ ipqx:
/* toggle refIn/refOut and reflect arguments */ /* toggle refIn/refOut and reflect arguments */
if (~rflags & R_HAVERI) { if (~rflags & R_HAVERI) {
model.flags ^= P_REFIN | P_REFOUT; model.flags ^= P_REFIN | P_REFOUT;
for (qptr = apolys; qptr < pptr; ++qptr) for (qptr = apolys; qptr < pptr; ++qptr) {
prevch(qptr, ibperhx); prevch(qptr, ibperhx);
}
} }
} while (~rflags & R_HAVERI && ++pass < 2); } while (~rflags & R_HAVERI && ++pass < 2);
} }
if (uflags & C_RESULT) { if (uflags & C_RESULT) {
for (qptr = apolys; qptr < pptr; ++qptr) for (qptr = apolys; qptr < pptr; ++qptr) {
pfree(qptr); pfree(qptr);
}
free(apolys);
mfree(&model);
return 1; return 1;
//exit(EXIT_SUCCESS); //exit(EXIT_SUCCESS);
} }
@ -467,8 +482,10 @@ ipqx:
pass = 0; pass = 0;
do { do {
mptr = candmods = reveng(&model, qpoly, rflags, args, apolys); mptr = candmods = reveng(&model, qpoly, rflags, args, apolys);
if (mptr && plen(mptr->spoly)) if (mptr && plen(mptr->spoly)) {
uflags |= C_RESULT; uflags |= C_RESULT;
}
while (mptr && plen(mptr->spoly)) { while (mptr && plen(mptr->spoly)) {
/* results were printed by the callback /* results were printed by the callback
* string = mtostr(mptr); * string = mtostr(mptr);
@ -478,26 +495,31 @@ ipqx:
mfree(mptr++); mfree(mptr++);
} }
free(candmods); free(candmods);
if (~rflags & R_HAVERI) { if (~rflags & R_HAVERI) {
model.flags ^= P_REFIN | P_REFOUT; model.flags ^= P_REFIN | P_REFOUT;
for (qptr = apolys; qptr < pptr; ++qptr) for (qptr = apolys; qptr < pptr; ++qptr) {
prevch(qptr, ibperhx); prevch(qptr, ibperhx);
}
} }
} while (~rflags & R_HAVERI && ++pass < 2); } while (~rflags & R_HAVERI && ++pass < 2);
for (qptr = apolys; qptr < pptr; ++qptr)
for (qptr = apolys; qptr < pptr; ++qptr) {
pfree(qptr); pfree(qptr);
}
free(apolys); free(apolys);
if (~uflags & C_RESULT) if (~uflags & C_RESULT)
uerror("no models found"); uerror("no models found");
break; break;
default: /* no mode specified */ default: /* no mode specified */
fprintf(stderr, "%s: no mode switch specified. Use %s -h for help.\n", myname, myname); fprintf(stderr, "%s: no mode switch specified. Use %s -h for help.\n", myname, myname);
return 0; return 0;
//exit(EXIT_FAILURE);
} }
return 1; return 1;
//exit(EXIT_SUCCESS);
} }
void void

27
client/src/cmdcrc.c
View file

@ -254,7 +254,6 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
int ibperhx = 8, obperhx = 8; int ibperhx = 8, obperhx = 8;
// int rflags = 0; // search flags // int rflags = 0; // search flags
int c;
poly_t apoly, crc; poly_t apoly, crc;
char *string; char *string;
@ -266,7 +265,7 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
SETBMP(); SETBMP();
//set model //set model
c = mbynam(&model, inModel); int c = mbynam(&model, inModel);
if (!c) { if (!c) {
PrintAndLogEx(ERR, "error: preset model '%s' not found. Use reveng -D to list presets. [%d]", inModel, c); PrintAndLogEx(ERR, "error: preset model '%s' not found. Use reveng -D to list presets. [%d]", inModel, c);
return 0; return 0;
@ -406,7 +405,7 @@ static int CmdrevengSearch(const char *Cmd) {
#define NMODELS 106 #define NMODELS 106
char inHexStr[100] = {0x00}; char inHexStr[256] = {0x00};
int dataLen = param_getstr(Cmd, 0, inHexStr, sizeof(inHexStr)); int dataLen = param_getstr(Cmd, 0, inHexStr, sizeof(inHexStr));
if (dataLen < 4) return 0; if (dataLen < 4) return 0;
@ -419,7 +418,12 @@ static int CmdrevengSearch(const char *Cmd) {
char revResult[30]; char revResult[30];
int ans = GetModels(Models, &count, width); int ans = GetModels(Models, &count, width);
bool found = false; bool found = false;
if (!ans) return 0; if (!ans) {
for (int i = 0; i < count; i++) {
free(Models[i]);
}
return 0;
}
// try each model and get result // try each model and get result
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
@ -430,8 +434,10 @@ static int CmdrevengSearch(const char *Cmd) {
// round up to # of characters in this model's crc // round up to # of characters in this model's crc
uint8_t crcChars = ((width[i] + 7) / 8) * 2; uint8_t crcChars = ((width[i] + 7) / 8) * 2;
// can't test a model that has more crc digits than our data // can't test a model that has more crc digits than our data
if (crcChars >= dataLen) if (crcChars >= dataLen) {
free(Models[i]);
continue; continue;
}
PrintAndLogEx(DEBUG PrintAndLogEx(DEBUG
, "DEBUG: dataLen %d, crcChars %u, width[i] %u" , "DEBUG: dataLen %d, crcChars %u, width[i] %u"
@ -440,8 +446,10 @@ static int CmdrevengSearch(const char *Cmd) {
, width[i] , width[i]
); );
if (crcChars == 0) if (crcChars == 0) {
free(Models[i]);
continue; continue;
}
memset(result, 0, 30); memset(result, 0, 30);
char *inCRC = calloc(crcChars + 1, sizeof(char)); char *inCRC = calloc(crcChars + 1, sizeof(char));
@ -493,8 +501,10 @@ static int CmdrevengSearch(const char *Cmd) {
free(Models[i]); free(Models[i]);
} }
if (!found) PrintAndLogEx(FAILED, "\nno matches found\n"); if (found == false)
return 1; PrintAndLogEx(FAILED, "\nno matches found\n");
return PM3_SUCCESS;
} }
int CmdCrc(const char *Cmd) { int CmdCrc(const char *Cmd) {
@ -510,6 +520,7 @@ int CmdCrc(const char *Cmd) {
} else { } else {
reveng_main(argc, argv); reveng_main(argc, argv);
} }
for (int i = 0; i < argc; ++i) { for (int i = 0; i < argc; ++i) {
free(argv[i]); free(argv[i]);
} }