| Message ID | 20190410232339.3395-1-jakub.kicinski@netronome.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net/tls: fix build without CONFIG_TLS_DEVICE | expand |
From: Jakub Kicinski <jakub.kicinski@netronome.com> Date: Wed, 10 Apr 2019 16:23:39 -0700 > 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> Applied, thanks Jakub.
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index a3cca1ef0098..9547cea0ce3b 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -287,8 +287,10 @@ static void tls_sk_proto_close(struct sock *sk, long timeout) 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) {
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> --- net/tls/tls_main.c | 2 ++ 1 file changed, 2 insertions(+)