From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE231C43381 for ; Mon, 1 Apr 2019 17:06:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 72A1021925 for ; Mon, 1 Apr 2019 17:06:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554138374; bh=TvLMVXqghz13fm+3o3H0cfSCcDS5lBq+90pR/nBu3yU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MQktn/yKvFRQFNlKAM+eiaF7OT8aEZC71oiD4IpBh77Wr8VQO8GUXKIwMKacIA1Wc sDetT4y0YdVLrrYU2pwNQRnxdprqrHVf2khQ6iUbFaZMU2js4qR0r58GayUUPDTGpz /4NZvWzpoh7qaFNsDWn4VhRsfMS412JwXX5iIw4M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729176AbfDARGN (ORCPT ); Mon, 1 Apr 2019 13:06:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:51672 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728768AbfDARGM (ORCPT ); Mon, 1 Apr 2019 13:06:12 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DCB5B21924; Mon, 1 Apr 2019 17:06:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554138371; bh=TvLMVXqghz13fm+3o3H0cfSCcDS5lBq+90pR/nBu3yU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S7DO15IFlgwo6fc6HMXJjk7R1/Am7VT42nlMHjP97kTdZL37d/aOGbjXuLt0dAoz6 oetG73ghw3ZTdKQFhKailzgxiCTdnUH1/FInP0+ZIjn73qIa1NXmjcll7CJSQPHm8C 6lsnRnRIyCMxxW1ldmXiwPUNL2qdjQ4cmY0CxFqQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paolo Abeni , "David S. Miller" , Christoph Paasch Subject: [PATCH 5.0 011/146] net: datagram: fix unbounded loop in __skb_try_recv_datagram() Date: Mon, 1 Apr 2019 19:00:23 +0200 Message-Id: <20190401170049.392898639@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170048.449559024@linuxfoundation.org> References: <20190401170048.449559024@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 5.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Paolo Abeni [ Upstream commit 0b91bce1ebfc797ff3de60c8f4a1e6219a8a3187 ] Christoph reported a stall while peeking datagram with an offset when busy polling is enabled. __skb_try_recv_datagram() uses as the loop termination condition 'queue empty'. When peeking, the socket queue can be not empty, even when no additional packets are received. Address the issue explicitly checking for receive queue changes, as currently done by __skb_wait_for_more_packets(). Fixes: 2b5cd0dfa384 ("net: Change return type of sk_busy_loop from bool to void") Reported-and-tested-by: Christoph Paasch Signed-off-by: Paolo Abeni Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/datagram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/core/datagram.c +++ b/net/core/datagram.c @@ -279,7 +279,7 @@ struct sk_buff *__skb_try_recv_datagram( break; sk_busy_loop(sk, flags & MSG_DONTWAIT); - } while (!skb_queue_empty(&sk->sk_receive_queue)); + } while (sk->sk_receive_queue.prev != *last); error = -EAGAIN;