From patchwork Fri Nov 30 21:18:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10707197 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3491514E2 for ; Fri, 30 Nov 2018 21:20:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 273F0305CD for ; Fri, 30 Nov 2018 21:20:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B6BE305CC; Fri, 30 Nov 2018 21:20:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 215A1305CD for ; Fri, 30 Nov 2018 21:19:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726554AbeLAIad (ORCPT ); Sat, 1 Dec 2018 03:30:33 -0500 Received: from mail-it1-f196.google.com ([209.85.166.196]:52323 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725749AbeLAIad (ORCPT ); Sat, 1 Dec 2018 03:30:33 -0500 Received: by mail-it1-f196.google.com with SMTP id i7so630729iti.2 for ; Fri, 30 Nov 2018 13:19:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JnxyFvxY5NN6SQ0hgqhztaoWxo1cZSXYFICA/458MKw=; b=Um0RbNfxYjF4VHQF8YY6NsBKaELVqpqu8bjWjL0K+LPu20E9IJXbC236b8GUqJMayi Wedz6PszLujV9bJICXpzZmO2xI27kJF/WIqYgFVj4Ej2sJGgxPEJAVkmKZX4kfjiHFuW 5vppugSndC9CgCVOvKDCeE+ECARjANkPejjDAGZGjdMAkc4o/60TLpHgXEkU5mKKXJcA Rw8QWOt7B6ntJgJEKIz98r3afBkC3poN8JBOExuIvxS6G70eSAlwTQ6vqHYkrnQtOzmk geu/IfEUg8nCCYuPM20a5tOx+PUuLzO1heRQJstlftF8LWXYj40b/MQ9ECH7xZWv00fa rFrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JnxyFvxY5NN6SQ0hgqhztaoWxo1cZSXYFICA/458MKw=; b=BwG8E2OlVpt0hPV/xM3iu7QpfiLtnNZt5eQ50jIfyK1Dz3ryf3sJ/52ER66X8EHdLb ihBgTpypqPYNQft06wjiskBfauuLKyUqYVv/qPnZtVC22wdatmHIhXOnV0os5VJT/k08 94/SrQZMjyQZxXqLo3N9DMQ+G8e4nmmB4hbVBE2XUqH6TIeaS8ZeQL5vNvRpQhW8tlI2 /BGdjcL20846KBi0ajH4nRFUU/p6QP6R4+2DlOUvec2OI1fXD0ld/gLp9kS/e5iQcVJ/ mDvGKuTuyfiITNRars30cfEivjgJvTdWBqWAk1OKxO7pPdZAKmjI9QFNpijFPsayByVE VPMQ== X-Gm-Message-State: AA+aEWZ+IIwMefVxRacvxVob62BT4dibqwXkq+zoZgQ1ncZCNQ6PGktN TB6jMmkmYuLZSslFH6A2ng== X-Google-Smtp-Source: AFSGD/Xao63mfvz4++VOGb4qcblrHp0cLcBLi6Ok7ZIURbcIkKkg7tOKchrtvQNHXH0LepbEHdGQ5Q== X-Received: by 2002:a24:b604:: with SMTP id g4-v6mr349802itf.119.1543612795755; Fri, 30 Nov 2018 13:19:55 -0800 (PST) Received: from localhost.localdomain (c-68-40-195-73.hsd1.mi.comcast.net. [68.40.195.73]) by smtp.gmail.com with ESMTPSA id y1sm141393itb.29.2018.11.30.13.19.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Nov 2018 13:19:54 -0800 (PST) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: Chuck Lever Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 1/3] SUNRPC: call_connect_status() must handle tasks that got transmitted Date: Fri, 30 Nov 2018 16:18:44 -0500 Message-Id: <20181130211846.89000-1-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If a task failed to get the write lock in the call to xprt_connect(), then it will be queued on xprt->sending. In that case, it is possible for it to get transmitted before the call to call_connect_status(), in which case it needs to be handled by call_transmit_status() instead. Signed-off-by: Trond Myklebust --- net/sunrpc/clnt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index ae3b8145da35..e35d642558e7 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -1915,6 +1915,13 @@ call_connect_status(struct rpc_task *task) struct rpc_clnt *clnt = task->tk_client; int status = task->tk_status; + /* Check if the task was already transmitted */ + if (!test_bit(RPC_TASK_NEED_XMIT, &task->tk_runstate)) { + xprt_end_transmit(task); + task->tk_action = call_transmit_status; + return; + } + dprint_status(task); trace_rpc_connect_status(task); From patchwork Fri Nov 30 21:18:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10707199 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 49A6F679F for ; Fri, 30 Nov 2018 21:20:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C879305CC for ; Fri, 30 Nov 2018 21:20:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30D42305D6; Fri, 30 Nov 2018 21:20:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D0FC9305CE for ; Fri, 30 Nov 2018 21:19:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726571AbeLAIae (ORCPT ); Sat, 1 Dec 2018 03:30:34 -0500 Received: from mail-it1-f195.google.com ([209.85.166.195]:53864 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725749AbeLAIae (ORCPT ); Sat, 1 Dec 2018 03:30:34 -0500 Received: by mail-it1-f195.google.com with SMTP id g85so618212ita.3 for ; Fri, 30 Nov 2018 13:19:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=01dPSorkMzYoAkW8cLBYQTAhpw9QBeR18qNhoOAgQ3Y=; b=ZzTYc7f7+BmSqMQS0wQU7pPh4Gi/4qecvkbc8I7O7xmmT3cMlknmZL2xtsTHQdpCwv PeqQO/jNy1e+vHSpcsSJIob+uzYZDcTVB58NATPf3IkSvZKuKtTyIdH2rUCQf3QZNMc7 JrolU+cwq5Hm+YvgDwnfZZU9Zia4LgDS4kaxVGwfUFwwfgVH25CmeltSrmys7e89pBhV k0QeyzwVB2y3EirMpHLF6O9UxstqQr7Myh8FOH/QE70NkI1ADP9W8+ykvb8lFuyJQhmV atfZ4slFvBJi07JfPF3il9kvDK+6J3Rbyxj72nHHTh9pQ/BVrS/AwupqdeBh/MCsJByE 1CVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=01dPSorkMzYoAkW8cLBYQTAhpw9QBeR18qNhoOAgQ3Y=; b=ox0/bvfnpqyBv4rXHVcJ178RyXHbWZ+6mvn/Yl1tu8cgmrj3gtZvq2UXr5GZvCnen2 hh1nrNpH/XdA82eDAWuAVnOW7WOltR0cE6JrUxmJqzjD+LXreidyjdSN2ON/lND0sRxE WmAHh4EPGt+bpms+yJNHTk4TUDYEzMtREXeL2qsUaxpWoc9sbnCjfgld01E7I+XSlVYh u5b6gZWbPdxugAKtr4KCSQBr0Vjp3TOpP82LpZ7iEMuK6+iAdFrpkYO3Z9wcViFf0F3q LzgJvsghjpvpElR0WvzW7tm/vylGGTqaNHIKaV2TDM4TKp/3xLXOXdqAOSgVKGVfmJre cyzw== X-Gm-Message-State: AA+aEWaoiSKSMhFIQTlr4EoflybjR9aQwiUYIyh6ME4kJ09kYUGoDA5c iGSJi/bslaP+dKOH0n1xw+7W4vc= X-Google-Smtp-Source: AFSGD/W8r0r8h9vKG2RZ4ogByGn4b60FEdS3eSUu0TptprqQevo7NyDvPRVAxAA3nil6GRGPzDAGkQ== X-Received: by 2002:a24:ce45:: with SMTP id v66-v6mr377906itg.26.1543612796585; Fri, 30 Nov 2018 13:19:56 -0800 (PST) Received: from localhost.localdomain (c-68-40-195-73.hsd1.mi.comcast.net. [68.40.195.73]) by smtp.gmail.com with ESMTPSA id y1sm141393itb.29.2018.11.30.13.19.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Nov 2018 13:19:56 -0800 (PST) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: Chuck Lever Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 2/3] SUNRPC: Fix leak of krb5p encode pages Date: Fri, 30 Nov 2018 16:18:45 -0500 Message-Id: <20181130211846.89000-2-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181130211846.89000-1-trond.myklebust@hammerspace.com> References: <20181130211846.89000-1-trond.myklebust@hammerspace.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Chuck Lever call_encode can be invoked more than once per RPC call. Ensure that each call to gss_wrap_req_priv does not overwrite pointers to previously allocated memory. Signed-off-by: Chuck Lever Cc: stable@kernel.org Signed-off-by: Trond Myklebust --- net/sunrpc/auth_gss/auth_gss.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 5d3f252659f1..ba765473d1f0 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c @@ -1791,6 +1791,7 @@ priv_release_snd_buf(struct rpc_rqst *rqstp) for (i=0; i < rqstp->rq_enc_pages_num; i++) __free_page(rqstp->rq_enc_pages[i]); kfree(rqstp->rq_enc_pages); + rqstp->rq_release_snd_buf = NULL; } static int @@ -1799,6 +1800,9 @@ alloc_enc_pages(struct rpc_rqst *rqstp) struct xdr_buf *snd_buf = &rqstp->rq_snd_buf; int first, last, i; + if (rqstp->rq_release_snd_buf) + rqstp->rq_release_snd_buf(rqstp); + if (snd_buf->page_len == 0) { rqstp->rq_enc_pages_num = 0; return 0; From patchwork Fri Nov 30 21:18:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10707201 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F2C451057 for ; Fri, 30 Nov 2018 21:20:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDFB6305CC for ; Fri, 30 Nov 2018 21:20:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CFC6C305CD; Fri, 30 Nov 2018 21:20:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 308AA305D0 for ; Fri, 30 Nov 2018 21:19:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725749AbeLAIae (ORCPT ); Sat, 1 Dec 2018 03:30:34 -0500 Received: from mail-io1-f67.google.com ([209.85.166.67]:45427 "EHLO mail-io1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726619AbeLAIae (ORCPT ); Sat, 1 Dec 2018 03:30:34 -0500 Received: by mail-io1-f67.google.com with SMTP id w7so5665546iom.12 for ; Fri, 30 Nov 2018 13:19:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3CWz8gm7phc3o80CIT3ZbTk88epHNOUnjMVFja2rqvk=; b=t56+a2H+eBqFIprFD6BXyA4cNPBGO6PYEeUKXKYblnlnePAQHeeB126XNdADQMQkZ3 E9gDtKpa06mRomMSQD6TyvHxsNN6urET70XMqJ/zVxVXSGHN4lM+fL8Y4rYj0XQE16XJ KkCRwd/XxqhlN3PHrO8r7RIWSU8OO3vlWFLQ0kqovCE7g7GZSvzZ5ZsXl3KCoXe5M12R LYl4Y5mXgTTsdFJzhKuFr40Sdb3k3uEnxHH+vmhttIeavVXfmABlN5qJOIA3P9+LDkVl aSUV4N/j/dfFdPlEimjxzJl/DDCRcNL98f8czUjIZs7yEYGZq3af8fNoLHlmYAqsclQI IxCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3CWz8gm7phc3o80CIT3ZbTk88epHNOUnjMVFja2rqvk=; b=O+vy8XzHPu8awf/OsFg9W/enlrgKB90JsXNPVruWRssp536TFF+NXJg6SkbbSeEIBQ 65lVSV8suP7J8u4tv36qe6vt82oB9Kl+Tc0Z5deYTQsGHe32RvnqA0AvdlFpHWoAqV2P uQILRjuh3wul7ho4mViZqdCv2ccUQGoTjZaQ5L9kOg+npXjaeEVA6VUIkVaP+n3LgUpw Pq7WxiFG265dOwznuY+bCUE7ewwXEri8qZhPpefilgBOFNUbwnyx5uYVX2L8wVCI0BYz nO0RoDQKvwayDIj/jP2RJNRkQ6dr4nR+tLyNZ2WBfuChxGBrdfL7u76l/D+VtRy5sOG5 7Vdg== X-Gm-Message-State: AA+aEWZE6mbQeb+8ev7iw373EmhMBJL9mTKNf64U9OiINyZEGXdKPddz Z02Q7tLAYq7A9qpniYPdb252TEA= X-Google-Smtp-Source: AFSGD/WEb2fkxVTmDOWyG97AAFCgkZnsmXhihUc4c/ktd8yYo8NaNBOvJtUpZyyPjwcJOMXEYg1GgQ== X-Received: by 2002:a5e:8306:: with SMTP id x6mr5504196iom.229.1543612797301; Fri, 30 Nov 2018 13:19:57 -0800 (PST) Received: from localhost.localdomain (c-68-40-195-73.hsd1.mi.comcast.net. [68.40.195.73]) by smtp.gmail.com with ESMTPSA id y1sm141393itb.29.2018.11.30.13.19.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Nov 2018 13:19:56 -0800 (PST) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: Chuck Lever Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 3/3] SUNRPC: Ensure we refresh the bvec after RPCSEC_GSS encoding Date: Fri, 30 Nov 2018 16:18:46 -0500 Message-Id: <20181130211846.89000-3-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181130211846.89000-2-trond.myklebust@hammerspace.com> References: <20181130211846.89000-1-trond.myklebust@hammerspace.com> <20181130211846.89000-2-trond.myklebust@hammerspace.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A call to gss_wrap_req_priv() will end up replacing the original array in rqstp->rq_snd_buf.pages with a new one containing the encrypted data. In order to avoid having the rqstp->rq_snd_buf.bvec point to the wrong page data, we need to refresh that too. Signed-off-by: Trond Myklebust --- net/sunrpc/xprtsock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index ae77c71c1f64..615ef2397fc5 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -843,6 +843,7 @@ static int xs_nospace(struct rpc_rqst *req) static void xs_stream_prepare_request(struct rpc_rqst *req) { + xdr_free_bvec(&req->rq_rcv_buf); req->rq_task->tk_status = xdr_alloc_bvec(&req->rq_rcv_buf, GFP_NOIO); }