From patchwork Fri Mar 22 14:07:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 160895 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp857081jan; Fri, 22 Mar 2019 07:07:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqzMpjeQwahKLPEraZPp51evSXtsb1jlGlamo9StkYecFx9wveg1p76cZx772CGuDFlv1sUA X-Received: by 2002:a17:902:b404:: with SMTP id x4mr9857425plr.232.1553263668263; Fri, 22 Mar 2019 07:07:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553263668; cv=none; d=google.com; s=arc-20160816; b=ekK95M4dELghWVgXXDQhlPm+td0/o87w5IWqSB7Jd2a2dLMRbUmpWzIaRTUEEGsa/l t0iwpA8Qa1xabDLrrHMHkU+lbkiupnLJ3NDGlPr7m8OkFiX85Yq6AhtZCYNqv81NEJMk sQdEijvQNKQKL+U+PL7BbQnIuO1pbFDMhK7f3h4IzsjyEWDUi3XOiMk6tD+OIED06zdW y9M1iUqhnxzHZtirH2DTW3UWTu3gWVpdDt2sN9DDJvlEcLgMd7H3FFatCxV8DbY9kZEg alr4ts7v4sEYiaB95gyh54jr2UfBJJFRUWRIhDTM61o6zJB1fMWj0rHkf/HMTDputY29 ilPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=tRVMpxXGeFvb8G7lLtSwHXk+1ebcg8vqzrsOYNzyxsI=; b=zv9kJyboBEeKW+z+dMjQ3Xi+CLQiVbgGtm9z9II1L615gpNSUgDKHLdQ5oLcesjXNo jUDrTPGVnT7LhuMv0apbJ8QugiDhMsMlNjOB4JNxQsb/yLijaNOWVISYzZYSmwWWguxn 94WRX44s/QtxGkoWgXJKAyxefPrc3knPch0PB3/lbCsGOVC6l8M3/BnWL75C9nFaYZoD 9bUU75VpRD1xBPjnnUdUU9U26v2Dd2bSaHO6mIyFzBMa/GKRvA/P2yi7oIl5iRv+CPxC nWlCdLnoXR+fLvXC4iHTD8U0AQAGPT69i6C1CTPEAqPRHrBgki1XHuLcKrMCgUg8mObU h9tw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 62si7546037ple.393.2019.03.22.07.07.47; Fri, 22 Mar 2019 07:07:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728018AbfCVOHq (ORCPT + 31 others); Fri, 22 Mar 2019 10:07:46 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:57969 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727487AbfCVOHp (ORCPT ); Fri, 22 Mar 2019 10:07:45 -0400 Received: from wuerfel.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.145]) with ESMTPA (Nemesis) id 1M7KG2-1h42V92tcS-007ksc; Fri, 22 Mar 2019 15:07:27 +0100 From: Arnd Bergmann To: "J. Bruce Fields" , Jeff Layton Cc: clang-built-linux@googlegroups.com, Nick Desaulniers , Nathan Chancellor , Arnd Bergmann , Olga Kornievskaia , Chuck Lever , Scott Mayhew , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] nfsd: avoid uninitialized variable warning Date: Fri, 22 Mar 2019 15:07:11 +0100 Message-Id: <20190322140726.251521-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:ClqJeMIIUkB9B1PjxqSTgR+0icspArSydm3eP4QX8KXk1cbCgud iHZc7n3E2QXam7UFXOqaLr3HXM8LOTd2U4S7LTXrsyUQ54IFFxeDbvW/wtXsswAmsV1chi0 rqN2cRIbaW05brr7QR9dDT9gfEABoxBc87eMuY2V9zIPfqKo7QcioQkfny3zfEzAphCtCdx qZEceoJdxr28tF3H6gXdg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:LGxE0xuTpZs=:kZtuMZP9gxBlOmbKB5g9TH OFD7INBA+zol0o63/lMsauA3ARhRDRKe8iidgyjakTWaeROQqoo4WthKNxy8TkmiD7C1QSItU zpgPnrPMXti9I0NaAIut0axtEdCxeqUWnft6q7Us2QzV5NUqHo6Eln0Ppn7HAwSJOuvrAux7r W9ZdBUts+/grU2oqWMenrL1UBI6rUT6pYeUG6SP4JYWkZr/dhr0ZsBqxZQAA5YNBotRlDBvuh ZZc6hPTj/GS3tHvKjKqyve5mzzfwUrx2okO+jfErbxnUCdsfaqm5+JLpyxDW6bWw4FkgXWnOW otRnhAql9DsHXcQOcG5ohL0Xi1MHhBwA4aSMY9QG4JqMBfBMn4uEUz9wy1ZlF+hvFUYZvTDFS H23fTdcH8V9ve0+QvPK8JDoLp/cJdCYKiAZ3nEWZ5pH/679+Y5FPJTzRnSq7/rAnA1QYno0GW M3VEvyxCN11JyY/A63WX9YK+LLZEH531ra5ivba9T3KuugxBoHXddlME1Ls8TuSk0jM1cKUB/ xMcqGQvMaK2ite05Cm2jqB+MdbQpNz4aEOVw29R8as5RyBsBjKg86L3r5IRudm0EpmUy9xRMc 2XDYTcVK+q+KY7SPPDFQ9enKRiVjdi7nrxdLwEBrSNxbM0PxbpX7IDIXILDLa6HF/rKnV4iBC ETN/0wccaoozGT3tF3ala1X9JpGlf0vwVClaOFCRx+KHAoV9Ot85S9azf/edJRUaegDNsn5qm lZtiklxc2ZKY82NW8RQgWG7iW8AMvftx7lb6PQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org clang warns that 'contextlen' may be accessed without an initialization: fs/nfsd/nfs4xdr.c:2911:9: error: variable 'contextlen' is uninitialized when used here [-Werror,-Wuninitialized] contextlen); ^~~~~~~~~~ fs/nfsd/nfs4xdr.c:2424:16: note: initialize the variable 'contextlen' to silence this warning int contextlen; ^ = 0 Presumably this cannot happen, as FATTR4_WORD2_SECURITY_LABEL is set if CONFIG_NFSD_V4_SECURITY_LABEL is enabled. Adding another #ifdef like the other two in this function avoids the warning. Signed-off-by: Arnd Bergmann --- fs/nfsd/nfs4xdr.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.20.0 diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 3de42a729093..a3a3455826aa 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -2420,8 +2420,10 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, __be32 status; int err; struct nfs4_acl *acl = NULL; +#ifdef CONFIG_NFSD_V4_SECURITY_LABEL void *context = NULL; int contextlen; +#endif bool contextsupport = false; struct nfsd4_compoundres *resp = rqstp->rq_resp; u32 minorversion = resp->cstate.minorversion; @@ -2906,12 +2908,14 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, *p++ = cpu_to_be32(NFS4_CHANGE_TYPE_IS_TIME_METADATA); } +#ifdef CONFIG_NFSD_V4_SECURITY_LABEL if (bmval2 & FATTR4_WORD2_SECURITY_LABEL) { status = nfsd4_encode_security_label(xdr, rqstp, context, contextlen); if (status) goto out; } +#endif attrlen = htonl(xdr->buf->len - attrlen_offset - 4); write_bytes_to_xdr_buf(xdr->buf, attrlen_offset, &attrlen, 4);