Skip to content

Commit

Permalink
Implement additional QAT engine API input checking.
Browse files Browse the repository at this point in the history 
Change-Id: I07ef94ba31cc5be50f346a599e969c204de1728f
Signed-off-by: Steve Linsell <stevenx.linsell@intel.com>
  • Loading branch information
@paulturx @stevelinsell
paulturx authored and stevelinsell committed Feb 8, 2019
1 parent 7ad8952 commit 43a03bb
Show file tree
Hide file tree
Showing 15 changed files with 259 additions and 106 deletions.
43 changes: 31 additions & 12 deletions cmn_mem_drv_inf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
#include "cmn_mem_drv_inf.h"
#include "qae_mem.h"

#define unlikely(x) __builtin_expect (!!(x), 0)

static pthread_mutex_t mem_mutex = PTHREAD_MUTEX_INITIALIZER;
static int crypto_inited = 0;

Expand All @@ -70,7 +72,7 @@ void qaeCryptoMemFree(void *ptr)

MEM_DEBUG("Address: %p\n", ptr);

if (NULL == ptr) {
if (unlikely(NULL == ptr)) {
MEM_WARN("qaeCryptoMemFree trying to free NULL pointer.\n");
return;
}
Expand All @@ -92,6 +94,7 @@ void qaeCryptoMemFree(void *ptr)

void *qaeCryptoMemAlloc(size_t memsize, const char *file, int line)
{
/* Input params should already have been sanity-checked by calling function. */
int rc;
void *pAddress = NULL;

Expand Down Expand Up @@ -119,6 +122,7 @@ void *qaeCryptoMemRealloc(void *ptr, size_t memsize, const char *file,
{
void *nptr;

/* copyAllocPinnedMemory() will check the input params. */
nptr = copyAllocPinnedMemory(ptr, memsize, file, line);
if (nptr) {
qaeCryptoMemFree(ptr);
Expand All @@ -132,11 +136,7 @@ void *qaeCryptoMemReallocClean(void *ptr, size_t memsize,
{
void *nptr;

if (original_size > memsize) {
MEM_WARN("original_size : %zd > memsize : %zd", original_size, memsize);
return NULL;
}

/* copyAllocPinnedMemoryClean() checks the input params. */
nptr =
copyAllocPinnedMemoryClean(ptr, memsize, original_size, file, line);
if (nptr) {
Expand All @@ -150,8 +150,11 @@ void *copyAllocPinnedMemory(void *ptr, size_t size, const char *file,
{
void *nptr;

if ((nptr = qaeCryptoMemAlloc(size, file, line)) == NULL) {
MEM_WARN("pinned memory allocation failure\n");
if (unlikely((ptr == NULL) ||
(size == 0) ||
(file == NULL) ||
((nptr = qaeCryptoMemAlloc(size, file, line)) == NULL))) {
MEM_WARN("Pinned memory allocation failure\n");
return NULL;
}
memcpy(nptr, ptr, size);
Expand All @@ -163,19 +166,31 @@ void *copyAllocPinnedMemoryClean(void *ptr, size_t size, size_t original_size,
{
void *nptr;

if (unlikely((ptr == NULL) ||
(size == 0) ||
(original_size == 0) ||
(file == NULL))) {
MEM_WARN("Invalid input params.\n");
return NULL;
}
if (original_size > size) {
MEM_WARN("original_size : %zd > size : %zd", original_size, size);
return NULL;
}
if ((nptr = qaeCryptoMemAlloc(size, file, line)) == NULL) {
MEM_WARN("pinned memory allocation failure\n");
MEM_WARN("Clean pinned memory allocation failure\n");
return NULL;
}

memcpy(nptr, ptr, original_size);
return nptr;
}

int copyFreePinnedMemory(void *uptr, void *kptr, int size)
{
if (uptr == NULL || kptr == NULL) {
MEM_WARN("Input pointers uptr or kptr are NULL\n");
return 0;
if (uptr == NULL || kptr == NULL || size <= 0) {
MEM_WARN("Input pointers uptr or kptr are NULL, or size invalid.\n");
return 0;
}

memcpy(uptr, kptr, size);
Expand All @@ -185,6 +200,10 @@ int copyFreePinnedMemory(void *uptr, void *kptr, int size)

CpaPhysicalAddr qaeCryptoMemV2P(void *v)
{
if (v == NULL) {
MEM_WARN("NULL address passed to function\n");
return (CpaPhysicalAddr)0;
}
return qaeVirtToPhysNUMA(v);
}

Expand Down
4 changes: 2 additions & 2 deletions e_qat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ qat_engine_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))

case QAT_CMD_SET_CRYPTO_SMALL_PACKET_OFFLOAD_THRESHOLD:
#ifndef OPENSSL_ENABLE_QAT_SMALL_PACKET_CIPHER_OFFLOADS
if (p) {
if (p != NULL) {
char *token;
char str_p[QAT_MAX_INPUT_STRING_LENGTH];
char *itr = str_p;
Expand Down Expand Up @@ -924,7 +924,7 @@ int qat_engine_finish_int(ENGINE *e, int reset_globals)
* if requested, i.e. when we are not re-initializing the engine after
* forking
*/
if (reset_globals) {
if (reset_globals == 1) {
enable_external_polling = 0;
enable_inline_polling = 0;
enable_event_driven_polling = 0;
Expand Down
66 changes: 52 additions & 14 deletions multi_thread_qaememutils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ static int slot_sizes_available[] = {
SLOT_32_KILOBYTES
};

#define unlikely(x) __builtin_expect (!!(x), 0)

typedef struct _qae_slot {
struct _qae_slot *next;
int sig;
Expand Down Expand Up @@ -247,11 +249,13 @@ void *copyAllocPinnedMemory(void *ptr, size_t size, const char *file,
{
void *nptr;

if ((nptr = qaeCryptoMemAlloc(size, file, line)) == NULL) {
if (unlikely((ptr == NULL) ||
(size == 0) ||
(file == NULL) ||
((nptr = qaeCryptoMemAlloc(size, file, line)) == NULL))) {
MEM_WARN("pinned memory allocation failure\n");
return NULL;
}

memcpy(nptr, ptr, size);
return nptr;
}
Expand Down Expand Up @@ -280,10 +284,21 @@ void *copyAllocPinnedMemoryClean(void *ptr, size_t size, size_t original_size,
{
void *nptr;

if ((nptr = qaeCryptoMemAlloc(size, file, line)) == NULL) {
if (unlikely((ptr == NULL) ||
(size == 0) ||
(original_size == 0) ||
(file == NULL))) {
MEM_WARN("pinned memory allocation failure\n");
return NULL;
}
if (original_size > size) {
MEM_WARN("original_size : %zd > size : %zd", original_size, size);
return NULL;
}
if ((nptr = qaeCryptoMemAlloc(size, file, line)) == NULL) {
MEM_WARN("Clean pinned memory allocation failure\n");
return NULL;
}

memcpy(nptr, ptr, original_size);
return nptr;
Expand All @@ -304,16 +319,14 @@ void *copyAllocPinnedMemoryClean(void *ptr, size_t size, size_t original_size,
******************************************************************************/
int copyFreePinnedMemory(void *uptr, void *kptr, int size)
{
if (uptr == NULL || kptr == NULL) {
MEM_WARN("Input pointers uptr or kptr are NULL\n");
if (unlikely(uptr == NULL || kptr == NULL || size <= 0)) {
MEM_WARN("Input pointers uptr or kptr are NULL, or size invalid.\n");
return 0;
}

if (size > MAX_ALLOC) {
MEM_WARN("Size greater than MAX_ALLOC\n");
return 0;
}

memcpy(uptr, kptr, size);
qaeCryptoMemFree(kptr);
return 1;
Expand Down Expand Up @@ -924,9 +937,9 @@ CpaPhysicalAddr qaeCryptoMemV2P(void *v)
qat_contig_mem_config *memCfg = NULL;
void *pVirtPageAddress = NULL;
ptrdiff_t offset = 0;
if(v == NULL) {
if (unlikely(v == NULL)) {
MEM_WARN("NULL address passed to function\n");
return (CpaPhysicalAddr) 0;
return (CpaPhysicalAddr)0;
}

/* Get the physical address contained in the slab
Expand All @@ -942,7 +955,7 @@ CpaPhysicalAddr qaeCryptoMemV2P(void *v)
if(memCfg->signature == QAT_CONTIG_MEM_ALLOC_SIG)
return (CpaPhysicalAddr)(memCfg->physicalAddress + offset);
MEM_WARN("Virtual to Physical memory lookup failure\n");
return (CpaPhysicalAddr) 0;
return (CpaPhysicalAddr)0;
}

/**************************************
Expand All @@ -964,9 +977,10 @@ CpaPhysicalAddr qaeCryptoMemV2P(void *v)
******************************************************************************/
void *qaeCryptoMemAlloc(size_t memsize, const char *file, int line)
{
/* Input params should already have been sanity-checked by calling function. */
void *pAddress = crypto_alloc_from_slab(memsize, file, line);
MEM_DEBUG("Address: %p Size: %lu File: %s:%d\n", pAddress,
memsize, file, line);
MEM_DEBUG("Address: %p Size: %lu File: %s:%d\n",
pAddress, memsize, file, line);
return pAddress;
}

Expand All @@ -983,8 +997,13 @@ void *qaeCryptoMemAlloc(size_t memsize, const char *file, int line)
void qaeCryptoMemFree(void *ptr)
{
MEM_DEBUG("Address: %p\n", ptr);
if (NULL != ptr)
crypto_free_to_slab(ptr);
{
if (NULL != ptr)
crypto_free_to_slab(ptr);
else {
MEM_WARN("qaeCryptoMemFree trying to free NULL pointer.\n");
}
}
}

/******************************************************************************
Expand All @@ -1006,6 +1025,13 @@ void qaeCryptoMemFree(void *ptr)
void *qaeCryptoMemRealloc(void *ptr, size_t memsize, const char *file,
int line)
{
if (unlikely((ptr == NULL) ||
(memsize == 0) ||
(file == NULL))) {
MEM_WARN("Input parameter invalid.\n");
return NULL;
}

int copy = crypto_slot_get_size(ptr);
void *n = crypto_alloc_from_slab(memsize, file, line);
if (n == NULL) {
Expand Down Expand Up @@ -1046,6 +1072,18 @@ void *qaeCryptoMemReallocClean(void *ptr, size_t memsize,
size_t original_size, const char *file,
int line)
{
if (unlikely((ptr == NULL) ||
(memsize == 0) ||
(original_size == 0) ||
(file == NULL))) {
MEM_WARN("Input param. invalid.\n");
return NULL;
}
if (original_size > memsize) {
MEM_WARN("original_size : %zd > memsize : %zd", original_size, memsize);
return NULL;
}

int copy = crypto_slot_get_size(ptr);
void *n = crypto_alloc_from_slab(memsize, file, line);
if (n == NULL) {
Expand Down
Loading

0 comments on commit 43a03bb

Please sign in to comment.