diff options
| author | Kees Cook <keescook@chromium.org> | 2021-06-16 23:39:51 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2021-06-22 18:23:35 +0300 |
| commit | 70ca8441ebfc4412dc9d3c56409e73dba959ab34 (patch) | |
| tree | 8ea07c74e12ea05739f6ba371907fe45debedef5 /drivers/net/wireless/intersil/orinoco/wext.c | |
| parent | b38678a73c4d8a3616ca14713154e062b4c4db63 (diff) | |
| download | linux-70ca8441ebfc4412dc9d3c56409e73dba959ab34.tar.xz | |
orinoco: Avoid field-overflowing memcpy()
In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memcpy(), memmove(), and memset(), avoid
intentionally writing across neighboring array fields.
Validate the expected key size and introduce a wrapping structure
to use as the multi-field memcpy() destination so that overflows
can be correctly detected.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210616203952.1248910-1-keescook@chromium.org
Diffstat (limited to 'drivers/net/wireless/intersil/orinoco/wext.c')
| -rw-r--r-- | drivers/net/wireless/intersil/orinoco/wext.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intersil/orinoco/wext.c b/drivers/net/wireless/intersil/orinoco/wext.c index 7b6c4ae8ddb3..4a01260027bc 100644 --- a/drivers/net/wireless/intersil/orinoco/wext.c +++ b/drivers/net/wireless/intersil/orinoco/wext.c @@ -791,7 +791,7 @@ static int orinoco_ioctl_set_encodeext(struct net_device *dev, err = __orinoco_hw_set_tkip_key(priv, idx, ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY, - priv->keys[idx].key, + priv->keys[idx].key, priv->keys[idx].key_len, tkip_iv, ORINOCO_SEQ_LEN, NULL, 0); if (err) printk(KERN_ERR "%s: Error %d setting TKIP key" |