From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3216147-1523476325-2-18043056049144829894 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523476323; b=IznC+Pjvuj8PN1sxkmj06EB9V7avivwSjqqMSFzTFBO7eIzh2w AUijQ+1OJJR6Dc/j7MYLvw170p1aUDoA/kvnBCWIafbMjP0xN/M622x0pcnEu4xP aRiJPM2wTpdh9CpCDv4RZhexb7n9XB01m2KLCWPLNqaaUg2tEpTj2qNbF+qPgTgH 01S0IEkIveVoDBGzUrM8sHUz+kMFkeMZH91ApylwwPivk7hs80YJ/7MlqTH7JYPy pZfpM4eyYsbX9L07Xhpw0Ah5mDjmhJN0zqnAPVtiicp2zzRiN3PsBI/ETXzmKHqL drrW1cX5VJBbM61IR3UxBS6PYBbngW8P+djA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523476323; bh=rSvmN602/DtS5QrQl3abDprzLcqfa/ OH6fNNUQ/kon4=; b=logAXZDvxHToVqBXUT3EAds1pfNPVY3bZGzhCVlxaHoKSr viSHbpaL+6HaPcXoi3TLjkTClpmS+hSifdpjCsKU2ARgakwDryQxCP6kglVOYbdM tCHNUvsutp6/CqeOPtQP+tjs5dTc5hY0NcvcruIgRyTBg/xMedA9OAZrqzfJ/vAW puIGgEpMIIJRju4s31oL+ggW9xRYIv/bZMAGu2X9s3D5FqJqYqPSbW4wKu13Eem+ v0uDs7w50HzRGSUVUfcLw9rOCNgQPAAaAF4AwxLAYyMY0PBKL4y5ifBc3q5BQjXN l0QzettbEGkeqUuebhdIF+PorNqfmiC4LS99duoA== ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfINGCLkqXuOm2Slu7PGi5BH71G2fITENPmDgZeFVaantdBG459p6Oubehw6exUTtiup3QA5vxmTYUm4pbRjEYQqPZSmB4KVDDar3CdtZCM9pavs5r3Xk RZOdFZYVbgKPn8qJjDysXoKjb2qBKsv3UBD5xaRLTG+8xL8QgH32YPGqknBxnPVEIUzGkzzyjplIGkRYPLIbQmKGfLBaqX2F0ZcyX/v5h6C04HJZIVV54Og4 X-CM-Analysis: v=2.3 cv=JLoVTfCb c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=yPCof4ZbAAAA:8 a=J1Y8HTJGAAAA:8 a=yMhMjlubAAAA:8 a=ag1SF4gXAAAA:8 a=TOaSPq0KXyr3G-_O67wA:9 a=QEXdDO2ut3YA:10 a=y1Q9-5lHfBjTkpIzbSAN:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933406AbeDKS6L (ORCPT ); Wed, 11 Apr 2018 14:58:11 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:36578 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933250AbeDKS6J (ORCPT ); Wed, 11 Apr 2018 14:58:09 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sowmini Varadhan , Santosh Shilimkar , "David S. Miller" , Sasha Levin Subject: [PATCH 4.9 125/310] rds; Reset rs->rs_bound_addr in rds_add_bound() failure path Date: Wed, 11 Apr 2018 20:34:24 +0200 Message-Id: <20180411183627.730478454@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183622.305902791@linuxfoundation.org> References: <20180411183622.305902791@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sowmini Varadhan [ Upstream commit 7ae0c649c47f1c5d2db8cee6dd75855970af1669 ] If the rds_sock is not added to the bind_hash_table, we must reset rs_bound_addr so that rds_remove_bound will not trip on this rds_sock. rds_add_bound() does a rds_sock_put() in this failure path, so failing to reset rs_bound_addr will result in a socket refcount bug, and will trigger a WARN_ON with the stack shown below when the application subsequently tries to close the PF_RDS socket. WARNING: CPU: 20 PID: 19499 at net/rds/af_rds.c:496 \ rds_sock_destruct+0x15/0x30 [rds] : __sk_destruct+0x21/0x190 rds_remove_bound.part.13+0xb6/0x140 [rds] rds_release+0x71/0x120 [rds] sock_release+0x1a/0x70 sock_close+0xe/0x20 __fput+0xd5/0x210 task_work_run+0x82/0xa0 do_exit+0x2ce/0xb30 ? syscall_trace_enter+0x1cc/0x2b0 do_group_exit+0x39/0xa0 SyS_exit_group+0x10/0x10 do_syscall_64+0x61/0x1a0 Signed-off-by: Sowmini Varadhan Acked-by: Santosh Shilimkar Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- net/rds/bind.c | 1 + 1 file changed, 1 insertion(+) --- a/net/rds/bind.c +++ b/net/rds/bind.c @@ -114,6 +114,7 @@ static int rds_add_bound(struct rds_sock rs, &addr, (int)ntohs(*port)); break; } else { + rs->rs_bound_addr = 0; rds_sock_put(rs); ret = -ENOMEM; break;