Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp161933rwi; Tue, 18 Oct 2022 15:46:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4WM2EIt9Hot23MI56NhjIsB2dLwYP5zonNes0nF3GDRDzFlrDiKQpOheY8lQzF22MPsMyK X-Received: by 2002:a17:906:7055:b0:78b:9148:6b41 with SMTP id r21-20020a170906705500b0078b91486b41mr4193588ejj.629.1666133193583; Tue, 18 Oct 2022 15:46:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666133193; cv=none; d=google.com; s=arc-20160816; b=sAB+kj0ueyHrJpvhhyQkaVn/5ZeW1iJiXtNAXqRJVyUEDpX0AC9FYuxWS8rMTRtx1g 24uHUvO1Hxtci3/vffYcEVGjVmwQISTeTuvDRPIAVeylek1bMEBKz9Qqig0uyvrgHWDr ErEmPCIRv+IpoSmWjbSNTCU3nrQo+OeQ4P2DphN9sK56hsV8Sa7LgZyd6zYWqspD4oLP TuCk4HAfX43Ye8itwaOvsPJ1cqKlmi9AlQHTSefdMdRAD1YRRBi4CXC3kgypnA9ndjD1 a8hmVmjVIeOO57YuuPEXvtq7mymwoZxfSr/ToIGxUjWtUGP3RFalJ032G/PKvvMH+RBA cr9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=HxLCTYEtIQTJ/ID5CPHMrvXgtYIGm51YxUBPBnXurwA=; b=CBG7CZ4rPUBDcxNra9pMDedFhRtR3phq5eUDK6BioTMEmd+QW/I87bwE2VkXAJP8ub o06zFTIWhI7HoA9PbX5OVeJaPKPBv2DmZ36O35NPo7YYNi8jdiBDoMW3gYAMb1Kf1PE+ 6xFRgf8MI3sEcJlRJgQwAc4fpl+fkqHP1rJLnNUI6n79gyGMm/ciUy0qW5dHMHWswKaO 6m2XskYCHNNHpKsjq/EWCq5LIUXXxyhYrrgNScC8ppvR4G6osdVqbXGLCMvp0q/Cs3SG NcuNKWskmOnoO6tFxPPVG2WDiN57htVsrZxWPzrGWFeIjaBKbJI4TjNNGAQmoTuAZxus e0bQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=epNgVUfF; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nd18-20020a170907629200b0073306ff26besi14510891ejc.969.2022.10.18.15.45.45; Tue, 18 Oct 2022 15:46:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=epNgVUfF; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229768AbiJRWnz (ORCPT + 99 others); Tue, 18 Oct 2022 18:43:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230050AbiJRWnw (ORCPT ); Tue, 18 Oct 2022 18:43:52 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC9FE8A7E8 for ; Tue, 18 Oct 2022 15:43:51 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4994F61717 for ; Tue, 18 Oct 2022 22:43:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D58BC433D7; Tue, 18 Oct 2022 22:43:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666133030; bh=uwCVdX1ulfgefYmg7XZs99cD0gzgSY50547f4XFvpF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=epNgVUfF3nksWS3wK354Q9oyXDvTFIu6Ocq9Jct0gHFIE3sJeuzepaAhiJwnkNzcU egtUIR3UNZlt2dKpjAelMc4jBm8d7E/tzVoNB/6tQXZl/DG7jLgILuw+Z8PD9n3NC4 5lwc1u6fIGpebw1fcLo9IMtuxof3G3db3joE6cRsCW3jpPoZZkqyYNLxXjsajgXaL5 viozJP0ICKNnCT1SUhe1rVJE7O6cZLwXLss6v6POz9XdixdfjDQIHuhfVu78o1Touj coVSNdgAxbRiZf5QDS0e/Sp33ULSlKqx354AjTrXnSBaG+EDPd1QvSWILfoxim1frF hVQ85x8q3jtzw== From: trondmy@kernel.org To: Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH 3/3] NFSv4.2: Fix a memory stomp in decode_attr_security_label Date: Tue, 18 Oct 2022 18:37:23 -0400 Message-Id: <20221018223723.21242-3-trondmy@kernel.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221018223723.21242-2-trondmy@kernel.org> References: <20221018223723.21242-1-trondmy@kernel.org> <20221018223723.21242-2-trondmy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Trond Myklebust We must not change the value of label->len if it is zero, since that indicates we stored a label. Fixes: b4487b935452 ("nfs: Fix getxattr kernel panic and memory overflow") Signed-off-by: Trond Myklebust --- fs/nfs/nfs4xdr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 9103e022376a..deec76cf5afe 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -4236,12 +4236,10 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap, return -EIO; bitmap[2] &= ~FATTR4_WORD2_SECURITY_LABEL; if (len < NFS4_MAXLABELLEN) { - if (label) { - if (label->len) { - if (label->len < len) - return -ERANGE; - memcpy(label->label, p, len); - } + if (label && label->len) { + if (label->len < len) + return -ERANGE; + memcpy(label->label, p, len); label->len = len; label->pi = pi; label->lfs = lfs; -- 2.37.3