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=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 AD1A8C10F0E for ; Tue, 9 Apr 2019 15:48:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D13D2084C for ; Tue, 9 Apr 2019 15:48:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MgvWIC/k" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726507AbfDIPsa (ORCPT ); Tue, 9 Apr 2019 11:48:30 -0400 Received: from mail-it1-f193.google.com ([209.85.166.193]:34286 "EHLO mail-it1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726372AbfDIPs3 (ORCPT ); Tue, 9 Apr 2019 11:48:29 -0400 Received: by mail-it1-f193.google.com with SMTP id z17so3109929itc.1 for ; Tue, 09 Apr 2019 08:48:29 -0700 (PDT) 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=1A5NK/zg/oW1o+8IsGnp/XdXrqF9UEN0vlLWFqRQ5wQ=; b=MgvWIC/kXtuPFCKsiImLKvb19GjjVhc8J8JyYVFtS3UG7ia8m+nxejkCFxyWk2uqB9 Mn1Bz94K7+UO6ZW7GfmVzTxnuhOBPa9voZgGfG4BSY96ce6lHPYWrh2P6k3EkpulKTmj pPjZDQoJjPrVq+izfvIEG7I+4qnCkjwOVGhVmKqt4/hhPER5ixMfcLiERc2ZQBMGhoUm H1q86cb8iMpbwK4dypDe//tPm2ix95qsva1z5LW2DPDVAu3T35QapX1GUJzEM5TcC3mE OUu+vNeTB1iT3tE9j4LH/uHTvwga4LRn7Z95YPl7wxoF74j2Hu83kpzS4H5Gp/iSZZh7 Ca0g== 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=1A5NK/zg/oW1o+8IsGnp/XdXrqF9UEN0vlLWFqRQ5wQ=; b=n1ir2WP5gjz7zl6W1xzmwv5BNJh+hQg0cCsEIqLL0eosaeBoGtJiXP9OV+C+853R18 Sn9h/+R+JQzPZr36iYucF1jUaxZc04rX5CpTxiIJdsVMq6aeDq1oXHfcforvDn3Pc6r+ xGeCOurdpnbTYQ8ak+xA1hXKUsFjweBhPYfxPO9DsFFmnOdTj5yUuXTCroxxVE7xBrX1 +9TQXMx5k1UTow4ZT5V7Q/92GF+LdTBI5KOHz1JUYN2qVuLregj6gE76hC/p3Zk2xuuX 3IiJGvmnKJ7SrQZ4VWdiOpvdEBuFhc4pgeJD4FgJa4aOwLiX25Seo9D0QEnmd+N6Pe1q vqsg== X-Gm-Message-State: APjAAAVivfxh9frE+s076E9juQiNRpeAZPjSjQd0/OqwhU983ZBRMri6 yBx6NirPXelHaIgzn+m4UCwiJQc= X-Google-Smtp-Source: APXvYqzaFAf6HkzBB2ZkIHgHYSZkMUSQoWbWTlaNaiKCnhzzrzhUwCsGALjqXiNTf2L84UdZvv1ZPw== X-Received: by 2002:a24:6495:: with SMTP id t143mr24747349itc.156.1554824908540; Tue, 09 Apr 2019 08:48:28 -0700 (PDT) Received: from localhost.localdomain (c-68-40-189-247.hsd1.mi.comcast.net. [68.40.189.247]) by smtp.gmail.com with ESMTPSA id 62sm7026910itx.41.2019.04.09.08.48.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Apr 2019 08:48:27 -0700 (PDT) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: "J. Bruce Fields" Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 1/6] SUNRPC/nfs: Fix return value for nfs4_callback_compound() Date: Tue, 9 Apr 2019 11:46:14 -0400 Message-Id: <20190409154619.33615-2-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409154619.33615-1-trond.myklebust@hammerspace.com> References: <20190409154619.33615-1-trond.myklebust@hammerspace.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org RPC server procedures are normally expected to return a __be32 encoded status value of type 'enum rpc_accept_stat', however at least one function wants to return an authentication status of type 'enum rpc_auth_stat' in the case where authentication fails. This patch adds functionality to allow this. Fixes: a4e187d83d88 ("NFS: Don't drop CB requests with invalid principals") Signed-off-by: Trond Myklebust --- fs/nfs/callback_xdr.c | 2 +- include/linux/sunrpc/svc.h | 2 ++ net/sunrpc/svc.c | 27 ++++++++++++++++++++++----- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index 06233bfa6d73..73a5a5ea2976 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c @@ -983,7 +983,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp) out_invalidcred: pr_warn_ratelimited("NFS: NFSv4 callback contains invalid cred\n"); - return rpc_autherr_badcred; + return svc_return_autherr(rqstp, rpc_autherr_badcred); } /* diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h index e52385340b3b..7ff12c9dbeaf 100644 --- a/include/linux/sunrpc/svc.h +++ b/include/linux/sunrpc/svc.h @@ -271,6 +271,7 @@ struct svc_rqst { #define RQ_VICTIM (5) /* about to be shut down */ #define RQ_BUSY (6) /* request is busy */ #define RQ_DATA (7) /* request has data */ +#define RQ_AUTHERR (8) /* Request status is auth error */ unsigned long rq_flags; /* flags field */ ktime_t rq_qtime; /* enqueue time */ @@ -504,6 +505,7 @@ unsigned int svc_fill_write_vector(struct svc_rqst *rqstp, char *svc_fill_symlink_pathname(struct svc_rqst *rqstp, struct kvec *first, void *p, size_t total); +__be32 svc_return_autherr(struct svc_rqst *rqstp, __be32 auth_err); #define RPC_MAX_ADDRBUFLEN (63U) diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index dbd19697ee38..3d5dd6b86652 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -1144,6 +1144,22 @@ void svc_printk(struct svc_rqst *rqstp, const char *fmt, ...) static __printf(2,3) void svc_printk(struct svc_rqst *rqstp, const char *fmt, ...) {} #endif +__be32 +svc_return_autherr(struct svc_rqst *rqstp, __be32 auth_err) +{ + set_bit(RQ_AUTHERR, &rqstp->rq_flags); + return auth_err; +} +EXPORT_SYMBOL_GPL(svc_return_autherr); + +static __be32 +svc_get_autherr(struct svc_rqst *rqstp, __be32 *statp) +{ + if (test_and_clear_bit(RQ_AUTHERR, &rqstp->rq_flags)) + return *statp; + return rpc_auth_ok; +} + /* * Common routine for processing the RPC request. */ @@ -1290,11 +1306,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) procp->pc_release(rqstp); goto dropit; } - if (*statp == rpc_autherr_badcred) { - if (procp->pc_release) - procp->pc_release(rqstp); - goto err_bad_auth; - } + auth_stat = svc_get_autherr(rqstp, statp); + if (auth_stat != rpc_auth_ok) + goto err_release_bad_auth; if (*statp == rpc_success && procp->pc_encode && !procp->pc_encode(rqstp, resv->iov_base + resv->iov_len)) { dprintk("svc: failed to encode reply\n"); @@ -1351,6 +1365,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) svc_putnl(resv, 2); goto sendit; +err_release_bad_auth: + if (procp->pc_release) + procp->pc_release(rqstp); err_bad_auth: dprintk("svc: authentication failed (%d)\n", ntohl(auth_stat)); serv->sv_stats->rpcbadauth++; -- 2.20.1