]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
macsec: clear encryption keys from the stack after setting up offload
authorSabrina Dubroca <sd@queasysnail.net>
Wed, 2 Nov 2022 21:33:16 +0000 (22:33 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Nov 2022 09:03:53 +0000 (10:03 +0100)
[ Upstream commit aaab73f8fba4fd38f4d2617440d541a1c334e819 ]

macsec_add_rxsa and macsec_add_txsa copy the key to an on-stack
offloading context to pass it to the drivers, but leaves it there when
it's done. Clear it with memzero_explicit as soon as it's not needed
anymore.

Fixes: 3cf3227a21d1 ("net: macsec: hardware offloading infrastructure")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Reviewed-by: Antoine Tenart <atenart@kernel.org>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/macsec.c

index 2add76c8064bcf485f6e2131961480caa13556f1..ddfa853ec9b5392fe071d9b9af8d346c6fb93508 100644 (file)
@@ -1861,6 +1861,7 @@ static int macsec_add_rxsa(struct sk_buff *skb, struct genl_info *info)
                       secy->key_len);
 
                err = macsec_offload(ops->mdo_add_rxsa, &ctx);
+               memzero_explicit(ctx.sa.key, secy->key_len);
                if (err)
                        goto cleanup;
        }
@@ -2103,6 +2104,7 @@ static int macsec_add_txsa(struct sk_buff *skb, struct genl_info *info)
                       secy->key_len);
 
                err = macsec_offload(ops->mdo_add_txsa, &ctx);
+               memzero_explicit(ctx.sa.key, secy->key_len);
                if (err)
                        goto cleanup;
        }