From patchwork Fri May 1 13:21:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 226475 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.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 DD00FC47253 for ; Fri, 1 May 2020 14:00:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BBC822051A for ; Fri, 1 May 2020 14:00:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588341646; bh=bFzTwxNpNnXKW5y0Ld8IcgIJN0YnBTHn+0HciPjoj/Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=D0WMFTtXlkQRmzXA95F3S+cn9lBsmFHSNFmd683AjkX1MCzZtZEdqN9bP/G89xMbP RBp70K3flYXfNK4NG9JTS59O/SFD+uXQAUkkJ139jqsA5iSKbqBBp366n85Sc62OAd hcxECIos8hVE0T59ug0VpcN65NCYpQNXXUUUUDGY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729389AbgEAN1F (ORCPT ); Fri, 1 May 2020 09:27:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:49038 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729363AbgEAN1C (ORCPT ); Fri, 1 May 2020 09:27:02 -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 527EE24955; Fri, 1 May 2020 13:27:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588339620; bh=bFzTwxNpNnXKW5y0Ld8IcgIJN0YnBTHn+0HciPjoj/Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gq37U9jn0X8hPrt/P8FkapXV4TX/9OmG5QBuRF23MsH3NlqbdghaFyV6xQ+ooDdw8 8kkVF5z7eyMmQ8IpKNF+MLe9AdDFGdjrT1DrND+cUZZ+h05/YqtGNGBuw/SUNpR+Yi Wsa+16i+GybYYwnrMZaYVem0MKKEt0SsTzk+/7Pw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xin Long , Marcelo Ricardo Leitner , Neil Horman , "David S. Miller" , Guenter Roeck Subject: [PATCH 4.4 55/70] sctp: use right member as the param of list_for_each_entry Date: Fri, 1 May 2020 15:21:43 +0200 Message-Id: <20200501131530.005417399@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200501131513.302599262@linuxfoundation.org> References: <20200501131513.302599262@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Xin Long commit a8dd397903a6e57157f6265911f7d35681364427 upstream. Commit d04adf1b3551 ("sctp: reset owner sk for data chunks on out queues when migrating a sock") made a mistake that using 'list' as the param of list_for_each_entry to traverse the retransmit, sacked and abandoned queues, while chunks are using 'transmitted_list' to link into these queues. It could cause NULL dereference panic if there are chunks in any of these queues when peeling off one asoc. So use the chunk member 'transmitted_list' instead in this patch. Fixes: d04adf1b3551 ("sctp: reset owner sk for data chunks on out queues when migrating a sock") Signed-off-by: Xin Long Acked-by: Marcelo Ricardo Leitner Acked-by: Neil Horman Signed-off-by: David S. Miller Cc: Guenter Roeck Signed-off-by: Greg Kroah-Hartman --- net/sctp/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -185,13 +185,13 @@ static void sctp_for_each_tx_datachunk(s list_for_each_entry(chunk, &t->transmitted, transmitted_list) cb(chunk); - list_for_each_entry(chunk, &q->retransmit, list) + list_for_each_entry(chunk, &q->retransmit, transmitted_list) cb(chunk); - list_for_each_entry(chunk, &q->sacked, list) + list_for_each_entry(chunk, &q->sacked, transmitted_list) cb(chunk); - list_for_each_entry(chunk, &q->abandoned, list) + list_for_each_entry(chunk, &q->abandoned, transmitted_list) cb(chunk); list_for_each_entry(chunk, &q->out_chunk_list, list)