From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: [PATCH net] tls: check RCV_SHUTDOWN in tls_wait_data
Date: Fri, 20 Jul 2018 14:40:17 -0700 (PDT)
Message-ID: <20180720.144017.408300928327725195.davem@davemloft.net>
References: <20180718232227.4083740-1-doronrk@fb.com>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: davejwatson@fb.com, netdev@vger.kernel.org
To: doronrk@fb.com
Return-path: <netdev-owner@vger.kernel.org>
Received: from shards.monkeyblade.net ([23.128.96.9]:55458 "EHLO
        shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727749AbeGTWaY (ORCPT
        <rfc822;netdev@vger.kernel.org>); Fri, 20 Jul 2018 18:30:24 -0400
In-Reply-To: <20180718232227.4083740-1-doronrk@fb.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Doron Roberts-Kedes <doronrk@fb.com>
Date: Wed, 18 Jul 2018 16:22:27 -0700

> The current code does not check sk->sk_shutdown & RCV_SHUTDOWN.
> tls_sw_recvmsg may return a positive value in the case where bytes have
> already been copied when the socket is shutdown. sk->sk_err has been
> cleared, causing the tls_wait_data to hang forever on a subsequent
> invocation. Checking sk->sk_shutdown & RCV_SHUTDOWN, as in tcp_recvmsg,
> fixes this problem.
> 
> Fixes: c46234ebb4d1 ("tls: RX path for ktls")
> Acked-by: Dave Watson <davejwatson@fb.com>
> Signed-off-by: Doron Roberts-Kedes <doronrk@fb.com>

Applied and queued up for -stable, thanks!