From patchwork Thu Apr 14 12:36:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 8835831 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 128BCC0553 for ; Thu, 14 Apr 2016 12:37:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 371BF20125 for ; Thu, 14 Apr 2016 12:37:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B45F32026F for ; Thu, 14 Apr 2016 12:37:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754261AbcDNMhO (ORCPT ); Thu, 14 Apr 2016 08:37:14 -0400 Received: from mail-qg0-f44.google.com ([209.85.192.44]:33828 "EHLO mail-qg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932076AbcDNMhN (ORCPT ); Thu, 14 Apr 2016 08:37:13 -0400 Received: by mail-qg0-f44.google.com with SMTP id c6so61698499qga.1 for ; Thu, 14 Apr 2016 05:37:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poochiereds-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oSzJRr5jCEKR3V5/5yhW+ADJ+t69QS9GlAI4c8QtKK4=; b=MrUIJI99h78t1gUkVWS9pWkWPAJmnWOROGaaBYUyvdRSAQ93Ob+kAzKJ0d6ubrTNz0 qQrxb805wW29lIRm98RwH/EkYM8h3nF7j6mtmKdEMtI6T4WQDQaU/xs/ub8H6EiXE0xp bCuCzelxVjp+SaJY472St0wKrfanl2KVKLsHM1aNRmfOUwKh9WwO3nmuja6wEyPEz5+f Ykglfgs6uNjw0u7N2GxWgFQtq4cfYPMilnlhQzsHbBIuSMC2/9H9GqCn13+w3pSTGB3s oagTDvjuYvdYc4engg5ds/Oyivu97oVDXDZrloG5bSIc7f9mn72W14aivuwqhzoYn2Ts GoTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oSzJRr5jCEKR3V5/5yhW+ADJ+t69QS9GlAI4c8QtKK4=; b=aOiAd2y3TneN/7CNrFWlyG7MJ5p7+nCswUierSejnvlAji7yhX7vydnjDqSWxp1I17 ci7IAsuKQFGWN7igxSlgBfASOLTy3pYXoU1XHu9r69Tde3mgg1B5zbaGxK0zdhStVPoh dttbFTUDyF1OzhdON3bpLR3bt6hap16v/pCUu1i47eSRAMr6pz7X/BkKuAXJAIEFVvME b+SC9nA+Egj9s6mt5wk5n7KO/ORiG2u18lFyhjKPuevJayS/c9N5UTwPXLdKt3+cUdIb LkCio9Nyb3swhQxwOf2xnJuT0+xlsh3swdI4hVv8i5Drlk4JYFRcwaqbVbGs5zTUtyoq 3JzQ== X-Gm-Message-State: AOPr4FU0LLB5RzSy2QexcNhze7RScS0rJUQK1L2yoYXUFLDkePrvVYgteOdJ6uePPb6+ZQ== X-Received: by 10.140.141.6 with SMTP id 6mr18615966qhn.82.1460637432351; Thu, 14 Apr 2016 05:37:12 -0700 (PDT) Received: from tlielax.poochiereds.net ([2606:a000:1125:4074:3a60:77ff:fe93:a95d]) by smtp.googlemail.com with ESMTPSA id e11sm18022238qkb.39.2016.04.14.05.37.11 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Apr 2016 05:37:11 -0700 (PDT) From: Jeff Layton X-Google-Original-From: Jeff Layton To: trond.myklebust@primarydata.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH 1/8] sunrpc: allow generic_match to handle creds with NULL group_info ptr Date: Thu, 14 Apr 2016 08:36:58 -0400 Message-Id: <1460637425-1580-2-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1460637425-1580-1-git-send-email-jeff.layton@primarydata.com> References: <1460637425-1580-1-git-send-email-jeff.layton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This function seems to assume that the group_info is never NULL. If we fix it not to assume that then we should be able to avoid allocating group_info for flexfiles DS creds. Signed-off-by: Jeff Layton --- net/sunrpc/auth_generic.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/net/sunrpc/auth_generic.c b/net/sunrpc/auth_generic.c index 41248b1820c7..0bb0d58f240b 100644 --- a/net/sunrpc/auth_generic.c +++ b/net/sunrpc/auth_generic.c @@ -151,7 +151,7 @@ static int generic_match(struct auth_cred *acred, struct rpc_cred *cred, int flags) { struct generic_cred *gcred = container_of(cred, struct generic_cred, gc_base); - int i; + int i, gnum; if (acred->machine_cred) return machine_cred_match(acred, gcred, flags); @@ -166,9 +166,12 @@ generic_match(struct auth_cred *acred, struct rpc_cred *cred, int flags) goto out_match; /* Slow path... */ - if (gcred->acred.group_info->ngroups != acred->group_info->ngroups) + i = acred->group_info ? acred->group_info->ngroups : 0; + gnum = gcred->acred.group_info ? gcred->acred.group_info->ngroups : 0; + + if (gnum != i) goto out_nomatch; - for (i = 0; i < gcred->acred.group_info->ngroups; i++) { + for (i = 0; i < gnum; i++) { if (!gid_eq(GROUP_AT(gcred->acred.group_info, i), GROUP_AT(acred->group_info, i))) goto out_nomatch;