USB: wusbcore: crypto: Remove VLA usage
PATCH 1/1 USB: wusbcore: crypto: Remove VLA usage
In preparation to enabling -Wvla, remove VLA and replace it with dynamic memory allocation instead.
The use of stack Variable Length Arrays needs to be avoided, as they can be a vector for stack exhaustion, which can be both a runtime bug or a security flaw. Also, in general, as code evolves it is easy to lose track of how big a VLA can get. Thus, we can end up having runtime failures that are hard to debug.
Also, fixed as part of the directive to remove all VLAs from the kernel: https://lkml.org/lkml/2018/3/7/621
Notice that in this particular case, an alternative to kzalloc is kcalloc, in which case the code would look as follows instead:
iv = kcalloc(crypto_skcipher_ivsize(tfm_cbc), sizeof(*iv), GFP_KERNEL);
but if the data type of _iv_ never changes, or the type size is always one byte, kzalloc is good enough.
--- drivers/usb/wusbcore/crypto.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/usb/wusbcore/crypto.c +7 -4
@@ -202,7 +202,7 @@ static int wusb_ccm_mac(struct crypto_skcipher *tfm_cbc,struct scatterlist sg[4 ], sg_dst;void *dst_buf;size_t dst_size; -u8 iv[crypto_skcipher_ivsize (tfm_cbc)]; +u8 *iv;size_t zero_padding;/*
@@ -222,9 +222,11 @@ static int wusb_ccm_mac(struct crypto_skcipher *tfm_cbc, zero_padding; dst_buf =kzalloc (dst_size,GFP_KERNEL );if (!dst_buf) - goto error_dst_buf; + goto error_alloc; -memset (iv,0 ,sizeof (iv)); + iv =kzalloc (crypto_skcipher_ivsize (tfm_cbc),GFP_KERNEL ); +if (!iv) + goto error_alloc;/* Setup B0 */ scratch->b0.flags =0x59 ;/* Format B0 */
@@ -276,8 +278,9 @@ static int wusb_ccm_mac(struct crypto_skcipher *tfm_cbc,bytewise_xor (mic, &scratch->ax, iv,8 ); result =8 ; error_cbc_crypt: +kfree (iv);kfree (dst_buf); -error_dst_buf: +error_alloc:return result; }
I just discovered an issue with this patch. Please, drop it. I'll send v2 shortly.
Thanks
---
Gustavo
Quoted 54 lines · Gustavo A. R. Silva
In preparation to enabling -Wvla, remove VLA and replace it with dynamic memory allocation instead.
The use of stack Variable Length Arrays needs to be avoided, as they can be a vector for stack exhaustion, which can be both a runtime bug or a security flaw. Also, in general, as code evolves it is easy to lose track of how big a VLA can get. Thus, we can end up having runtime failures that are hard to debug.
Also, fixed as part of the directive to remove all VLAs from the kernel: https://lkml.org/lkml/2018/3/7/621
Notice that in this particular case, an alternative to kzalloc is kcalloc, in which case the code would look as follows instead:
iv =
kcalloc(crypto_skcipher_ivsize(tfm_cbc), sizeof(*iv), GFP_KERNEL);but if the data type of _iv_ never changes, or the type size is always one byte, kzalloc is good enough.
Signed-off-by Gustavo A. R. Silva <[email protected]>--- drivers/usb/wusbcore/crypto.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)drivers/usb/wusbcore/crypto.c +5
-3@@ -202,7 +202,7 @@ static int wusb_ccm_mac(struct crypto_skcipher *tfm_cbc,struct scatterlist sg[4 ], sg_dst;void *dst_buf;size_t dst_size; -u8 iv[crypto_skcipher_ivsize (tfm_cbc)]; +u8 *iv;size_t zero_padding;/* @@ -222,9 +222,11 @@ static int wusb_ccm_mac(struct crypto_skcipher *tfm_cbc, zero_padding; dst_buf =kzalloc (dst_size,GFP_KERNEL );if (!dst_buf) - goto error_dst_buf; + goto error_alloc; -memset (iv,0 ,sizeof (iv)); + iv =kzalloc (crypto_skcipher_ivsize (tfm_cbc),GFP_KERNEL ); +if (!iv) + goto error_alloc;/* Setup B0 */ scratch->b0.flags =0x59 ;/* Format B0 */
drivers/usb/wusbcore/crypto.c static int wusb_ccm_mac(struct crypto_skcipher *tfm_cbc, · line 286
Quoted 10 lines
drivers/usb/wusbcore/crypto.c +2
-1@@ -276,8 +278,9 @@ static int wusb_ccm_mac(struct crypto_skcipher *tfm_cbc,bytewise_xor (mic, &scratch->ax, iv,8 ); result =8 ; error_cbc_crypt: +kfree (iv);kfree (dst_buf); -error_dst_buf: +error_alloc:return result; }
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html