From patchwork Tue Jul 5 04:55:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cengiz Can X-Patchwork-Id: 1652228 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=co91LSKb; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LcVl90v9vz9s1l for ; Tue, 5 Jul 2022 14:56:53 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1o8acB-00089k-3l; Tue, 05 Jul 2022 04:56:47 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1o8ac8-00089U-NA for kernel-team@lists.ubuntu.com; Tue, 05 Jul 2022 04:56:44 +0000 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 4F0EB3F838 for ; Tue, 5 Jul 2022 04:56:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1656997004; bh=DLg8tp6cEoiVcZsEBNuuUWghdFkFLKqAOEajLyz3T8c=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=co91LSKbFtkwPeGZT2Pd7TsFY4FO8wBeMI4ZAiCm0b6HM1Hg4oF1ZDoQtrCjGglKX 2BHHsYr75YIEx4QKFrzkdDDPQ7y3+zqFpovNkD+7CpFhs96RQI5sL1EB8FsOPsDjrR A6ibHxUF4fm5M1SgIxEoLclVh2NnMGGgEDgJrwwq4fSZtJNaEL3cNrAOhocj3V5IuR Bc1dB5HDxeP6tkMLxhmKUnGaM29l0K6R237u9By6Y+1Orr7LKzfPRn+DnJ/1Ehu5bN 7IHMW7FOhyl5eg3gvAeXX9ahVZ4s4uyMWNZ6c9zxHgJC+qYl/3UzsS97nZpACBt6Bv leU4JS0tXXuEw== Received: by mail-ed1-f69.google.com with SMTP id w5-20020a056402268500b0043980311a5fso7982601edd.3 for ; Mon, 04 Jul 2022 21:56:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DLg8tp6cEoiVcZsEBNuuUWghdFkFLKqAOEajLyz3T8c=; b=GvrnFXH+UbI+p7ndxIJFdjZrgU4p/FiqVOZkiLKqahS8b0zNdvVE3ozkyGODHMUokh WfZhk+eRjRFT2iyHlr9pIBqc29EDn1HhWesISIkuqKjPggVO9n74xQ9BXGGyQOOME8Jv OEGQni4TEVUgl1tO5itrjhCMV0PLLOzq+jDphSYyWfhXcdVQuKBkfmO5RHv1sUFq1KQx yT/z1pvDS/PHoKes2QqnwEEAn24EXMhVXRup3hwhIQXo3Xew84dufOgfyxWa4O85anT+ ePbmMIUHRbayQEqQvmnyR1w6ZXaXw2+tu8U2uxzrCudTvqjZoE78y8q4j1OD6euvE5z2 Uv6Q== X-Gm-Message-State: AJIora89V7rJNAdF8YRCjMaWGXFDZSQAxJiNQpd1noaUf2SkCjX51osQ iSkAJz77M4cFv7rlDtUQajuWGC9rEL612/Q5GAJyxCQh6jQ3p/1AnTRsj/F2Tzh78wLXQOAK3lK 167eqePX/BE6CpLco4OPCrURMYpSd5adCBx1p4i/6/g== X-Received: by 2002:a17:906:1c5:b0:715:7c69:870e with SMTP id 5-20020a17090601c500b007157c69870emr32198641ejj.348.1656997003526; Mon, 04 Jul 2022 21:56:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sXUFuXUQnm4PbCWZAeVxVYOl6KV1FnMPWW3FH7Jvs7bC50moiV1U4SDHsCcPUBZ4Cy83h48Q== X-Received: by 2002:a17:906:1c5:b0:715:7c69:870e with SMTP id 5-20020a17090601c500b007157c69870emr32198631ejj.348.1656997003363; Mon, 04 Jul 2022 21:56:43 -0700 (PDT) Received: from localhost ([46.2.184.254]) by smtp.gmail.com with ESMTPSA id 5-20020a170906328500b006fe8a4ec62fsm869909ejw.4.2022.07.04.21.56.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Jul 2022 21:56:42 -0700 (PDT) From: Cengiz Can To: kernel-team@lists.ubuntu.com Subject: [SRU][Focal][PATCH v2 1/2] SUNRPC: Ensure we flush any closed sockets before xs_xprt_free() Date: Tue, 5 Jul 2022 07:55:46 +0300 Message-Id: <20220705045549.274705-2-cengiz.can@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220705045549.274705-1-cengiz.can@canonical.com> References: <20220705045549.274705-1-cengiz.can@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Trond Myklebust commit f00432063db1a0db484e85193eccc6845435b80e upstream. We must ensure that all sockets are closed before we call xprt_free() and release the reference to the net namespace. The problem is that calling fput() will defer closing the socket until delayed_fput() gets called. Let's fix the situation by allowing rpciod and the transport teardown code (which runs on the system wq) to call __fput_sync(), and directly close the socket. Reported-by: Felix Fu Acked-by: Al Viro Fixes: a73881c96d73 ("SUNRPC: Fix an Oops in udp_poll()") Cc: stable@vger.kernel.org # 5.1.x: 3be232f11a3c: SUNRPC: Prevent immediate close+reconnect Cc: stable@vger.kernel.org # 5.1.x: 89f42494f92f: SUNRPC: Don't call connect() more than once on a TCP socket Cc: stable@vger.kernel.org # 5.1.x Signed-off-by: Trond Myklebust [meenashanmugam: Fix merge conflict in xprt_connect] Signed-off-by: Meena Shanmugam Signed-off-by: Greg Kroah-Hartman CVE-2022-28893 (backported from commit 2f8f6c393b11b5da059b1fc10a69fc2f2b6c446a linux-5.4.y) [cengizcan: we already have __fput_sync exported as GPL only so do not EXPORT_SYMBOL it again] Signed-off-by: Cengiz Can --- net/sunrpc/xprt.c | 5 +---- net/sunrpc/xprtsock.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 8ac579778e487..6454a122416e6 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -863,10 +863,7 @@ void xprt_connect(struct rpc_task *task) if (!xprt_lock_write(xprt, task)) return; - if (test_and_clear_bit(XPRT_CLOSE_WAIT, &xprt->state)) - xprt->ops->close(xprt); - - if (!xprt_connected(xprt)) { + if (!xprt_connected(xprt) && !test_bit(XPRT_CLOSE_WAIT, &xprt->state)) { task->tk_rqstp->rq_connect_cookie = xprt->connect_cookie; rpc_sleep_on_timeout(&xprt->pending, task, NULL, xprt_request_timeout(task->tk_rqstp)); diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 480e879e74ae5..af4b12ff1d6f6 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -989,7 +989,7 @@ static int xs_local_send_request(struct rpc_rqst *req) /* Close the stream if the previous transmission was incomplete */ if (xs_send_request_was_aborted(transport, req)) { - xs_close(xprt); + xprt_force_disconnect(xprt); return -ENOTCONN; } @@ -1027,7 +1027,7 @@ static int xs_local_send_request(struct rpc_rqst *req) -status); /* fall through */ case -EPIPE: - xs_close(xprt); + xprt_force_disconnect(xprt); status = -ENOTCONN; } @@ -1303,6 +1303,16 @@ static void xs_reset_transport(struct sock_xprt *transport) if (sk == NULL) return; + /* + * Make sure we're calling this in a context from which it is safe + * to call __fput_sync(). In practice that means rpciod and the + * system workqueue. + */ + if (!(current->flags & PF_WQ_WORKER)) { + WARN_ON_ONCE(1); + set_bit(XPRT_CLOSE_WAIT, &xprt->state); + return; + } if (atomic_read(&transport->xprt.swapper)) sk_clear_memalloc(sk); @@ -1326,7 +1336,7 @@ static void xs_reset_transport(struct sock_xprt *transport) mutex_unlock(&transport->recv_mutex); trace_rpc_socket_close(xprt, sock); - fput(filp); + __fput_sync(filp); xprt_disconnect_done(xprt); } From patchwork Tue Jul 5 04:55:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cengiz Can X-Patchwork-Id: 1652229 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=pPmaAHUD; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LcVlV4B6dz9s1l for ; Tue, 5 Jul 2022 14:57:10 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1o8acS-0008Kd-Bd; Tue, 05 Jul 2022 04:57:04 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1o8acQ-0008Ga-7s for kernel-team@lists.ubuntu.com; Tue, 05 Jul 2022 04:57:02 +0000 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id EC9A93F838 for ; Tue, 5 Jul 2022 04:57:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1656997021; bh=uOJ66rzdZj+N7lYy+qNKeCdfu+4UDYGuxLwflfWNaYE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pPmaAHUDw7H6G9ZmaBvdIdr7M6SALH5aA/Oohgvt3DuXrLWekakQxY133xFzr86CR 8Hq53OETW6cGbx2Ir47vJm0riHzpeuIveZIDdjsu/QxbgK+i4QBOv6EWj1pZn1ZfAc ZSK3MoZHS/r6foZBlgjKzOVbJuL8ZdYAdXjoacWqOlFe/qIdmD3hCbjhi90/qKUc6M DwsqN+GerBkHtLRMAashat3strCvEFNapFN53dY0kfiiYlkWwxapUNuZC1DJ+yNnoJ IrHV4c9zL1a3c3i5T3l4iQjBk9C/+byA737zPwDjgCZ7ys0W17mZa3dMwu7kS1WOZA OH65dxAonAnZw== Received: by mail-ej1-f70.google.com with SMTP id hs18-20020a1709073e9200b0072a3e7eb0beso2301963ejc.10 for ; Mon, 04 Jul 2022 21:57:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uOJ66rzdZj+N7lYy+qNKeCdfu+4UDYGuxLwflfWNaYE=; b=4EiOCut5h/0GYzqQKWFcxEIG30372DPg+4U0Kwy269YSY88eXtU9EQlnbkarQUhhFE bt0dyDyXqRziocE9Y8WdsLdhM3A1GCwjVBWzeJY9XHgDFTkoc7TdNC2Mp+19uk9I229x oSAeDBFeNHOq+wEX9Ddu//dWlw05htGJ5cKHgl0xU5Lh53MA3UFbhVLf2gs+8Ythzja1 8XoqiohmsA2kbGeD3nWHvS7qo25AVm18KNb7nWJeJFrCnz3cO0wPxwgmXcCOC/Qklq47 LYXxe4lbsEnNTOgjS4o3nWab0uz2+3Wq91p8wFR9KAttMwTL/tpiFKyUA77c0M2xc7Z3 aKlg== X-Gm-Message-State: AJIora/SM61N0xT/gnkw1w6ZyuC/6XttsOiCjNo/u0dEb7t1W7GQaKLM IHOaYv5lS9JI2Zh33uR0D9A2n1YrBH9CGXcozIjFRxI0apb04FiyVh9D2xGvBC5VDAFtNcLKK6j h3n8Sb17ughKeUQ/jQlB+1UTOc6xzoF2dgG3/zcdMkA== X-Received: by 2002:a05:6402:35d6:b0:435:9f33:3363 with SMTP id z22-20020a05640235d600b004359f333363mr44306385edc.349.1656997020868; Mon, 04 Jul 2022 21:57:00 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sFJxlceBXNUH4CfOKG1IDcmitopJKXeZ3ZBUGLvW6+v9U/uWbwGOFA+3OlyVAEpbM3+NUNEA== X-Received: by 2002:a05:6402:35d6:b0:435:9f33:3363 with SMTP id z22-20020a05640235d600b004359f333363mr44306360edc.349.1656997020627; Mon, 04 Jul 2022 21:57:00 -0700 (PDT) Received: from localhost ([46.2.184.254]) by smtp.gmail.com with ESMTPSA id kt26-20020a170906aada00b00726dbb18b59sm9378782ejb.130.2022.07.04.21.57.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Jul 2022 21:57:00 -0700 (PDT) From: Cengiz Can To: kernel-team@lists.ubuntu.com Subject: [SRU][Focal][PATCH v2 2/2] SUNRPC: Don't leak sockets in xs_local_connect() Date: Tue, 5 Jul 2022 07:55:48 +0300 Message-Id: <20220705045549.274705-3-cengiz.can@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220705045549.274705-1-cengiz.can@canonical.com> References: <20220705045549.274705-1-cengiz.can@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Trond Myklebust If there is still a closed socket associated with the transport, then we need to trigger an autoclose before we can set up a new connection. Reported-by: wanghai (M) Fixes: f00432063db1 ("SUNRPC: Ensure we flush any closed sockets before xs_xprt_free()") Signed-off-by: Trond Myklebust CVE-2022-28893 (backported from commit aad41a7d7cf6c6fa804c872a2480f8e541da37cf) [cengizcan: we don't have commit c4f0396688b5 which fixes the indent issue so change context] Signed-off-by: Cengiz Can --- net/sunrpc/xprtsock.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index af4b12ff1d6f6..47df2cbc9175b 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -2063,6 +2063,9 @@ static void xs_local_connect(struct rpc_xprt *xprt, struct rpc_task *task) struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt); int ret; + if (transport->file) + goto force_disconnect; + if (RPC_IS_ASYNC(task)) { /* * We want the AF_LOCAL connect to be resolved in the @@ -2075,11 +2078,17 @@ static void xs_local_connect(struct rpc_xprt *xprt, struct rpc_task *task) */ task->tk_rpc_status = -ENOTCONN; rpc_exit(task, -ENOTCONN); - return; + goto out_wake; } ret = xs_local_setup_socket(transport); if (ret && !RPC_IS_SOFTCONN(task)) msleep_interruptible(15000); + return; +force_disconnect: + xprt_force_disconnect(xprt); +out_wake: + xprt_clear_connecting(xprt); + xprt_wake_pending_tasks(xprt, -ENOTCONN); } #if IS_ENABLED(CONFIG_SUNRPC_SWAP)