| From | Greg Kroah-Hartman <> | Subject | [PATCH 5.0 025/115] net/tls: fix build without CONFIG_TLS_DEVICE | Date | Wed, 24 Apr 2019 19:09:21 +0200 |
| |
From: Jakub Kicinski <jakub.kicinski@netronome.com>
[ Upstream commit 903f1a187776bb8d79b13618ec05b25f86318885 ]
buildbot noticed that TLS_HW is not defined if CONFIG_TLS_DEVICE=n. Wrap the cleanup branch into an ifdef, tls_device_free_resources_tx() wouldn't be compiled either in this case.
Fixes: 35b71a34ada6 ("net/tls: don't leak partially sent record in device mode") Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- net/tls/tls_main.c | 2 ++ 1 file changed, 2 insertions(+)
--- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -298,8 +298,10 @@ static void tls_sk_proto_close(struct so kfree(ctx->tx.rec_seq); kfree(ctx->tx.iv); tls_sw_free_resources_tx(sk); +#ifdef CONFIG_TLS_DEVICE } else if (ctx->tx_conf == TLS_HW) { tls_device_free_resources_tx(sk); +#endif } if (ctx->rx_conf == TLS_SW) {
|