2017-03-28 15:57:49

by Gary R Hook

Subject: [PATCH V2] crypto: ccp - Rearrange structure members to minimize size

The AES GCM function (in ccp-ops) requires a fair amount of
stack space, which elicits a complaint when KASAN is enabled.
Rearranging and packing a few structures eliminates the
warning.

Signed-off-by: Gary R Hook <[email protected]>
---
drivers/crypto/ccp/ccp-dev.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/ccp/ccp-dev.h b/drivers/crypto/ccp/ccp-dev.h
index 3a45c2a..191274d 100644
--- a/drivers/crypto/ccp/ccp-dev.h
+++ b/drivers/crypto/ccp/ccp-dev.h
@@ -427,33 +427,33 @@ enum ccp_memtype {
};
#define CCP_MEMTYPE_LSB CCP_MEMTYPE_KSB

+
struct ccp_dma_info {
dma_addr_t address;
unsigned int offset;
unsigned int length;
enum dma_data_direction dir;
-};
+} __packed __aligned(4);

struct ccp_dm_workarea {
struct device *dev;
struct dma_pool *dma_pool;
- unsigned int length;

u8 *address;
struct ccp_dma_info dma;
+ unsigned int length;
};

struct ccp_sg_workarea {
struct scatterlist *sg;
int nents;
+ unsigned int sg_used;

struct scatterlist *dma_sg;
struct device *dma_dev;
unsigned int dma_count;
enum dma_data_direction dma_dir;

- unsigned int sg_used;
-
u64 bytes_left;
};

2017-04-05 14:11:08

by Herbert Xu

Subject: Re: [PATCH V2] crypto: ccp - Rearrange structure members to minimize size

On Tue, Mar 28, 2017 at 10:57:26AM -0500, Gary R Hook wrote:
> The AES GCM function (in ccp-ops) requires a fair amount of
> stack space, which elicits a complaint when KASAN is enabled.
> Rearranging and packing a few structures eliminates the
> warning.
>
> Signed-off-by: Gary R Hook <[email protected]>

Patch applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt