Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp1104056pxa; Thu, 20 Aug 2020 02:34:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3IAVaw1+53V8Z6OWTFBq3IPc/2FeOiKJ7VoNBC8eyUZVW/z6iLRSP8oD3xCpDJeQUtcwM X-Received: by 2002:a50:ed84:: with SMTP id h4mr2049322edr.278.1597916050276; Thu, 20 Aug 2020 02:34:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597916050; cv=none; d=google.com; s=arc-20160816; b=GPcgLv88qlhp+ZUZavZJYbc+8MfWfqTdKwDS90KMNr61jt1OFc3R19ZFmrJxFx3yvT UFHaRLwR0lHQcj0SRQp/1v1cx7Vcn1e3fpDoxnJ7mvMCpCceepXnWhVEIfED5Q56SKIH zygysrlvhaUcTr6tU8h3kNQLZP+1PpVqRmpxfxEOywnBUNDu5xzrA8vGLsUv7o1a67c1 m7rzDqkNvD4foKWHcCZqwPp/sy+8zbb3hl3omKeM6eVVJ5u3RQ9/dh1maVOVDPPThg5A kBw2azXXDTrHDTtBaOEPvTIoo7YNSYpUa21oxSjtp+nt1++JYaXZMYo4E2m9sRwcmFZi 5DAQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qDtPaAti7LzlA9iDjiZx+4AcmhefOX8GJoCF1XVMGeM=; b=s/7wUBCHA21qngYWofcPd0ZFItqOe+ZgzNlRqCkq4F0tmoSlnpl8BoTw3d8meKNwvk Sad5dU27/jJMTjgOHq25cEd6z7kbJpwI/XZ3aN8lry3Wp72/unPQrypGfEZwVFBFnrO7 S/ilMpAdB5Spp6oTMKs3q0yr1zhD74az7aRBYT0dADW0SZ9H1zZrzipa+84zLeuzCSkD 3+dZEoFOK9E7dxt2d10e1v4j6jBYINQJIXaad4fEgHzj51scBQP+pU/P9mvthd25cBiD UTsKiMvtfxaaN89DbENMW9fIRFM62hwJ6WVKNnTAUCv2tr9r+ScvF1VxeAiISH3537X/ lFSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=i4sQ+yoC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bm24si1054973edb.331.2020.08.20.02.33.46; Thu, 20 Aug 2020 02:34:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=i4sQ+yoC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728003AbgHTJdO (ORCPT + 99 others); Thu, 20 Aug 2020 05:33:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:44130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727882AbgHTJb5 (ORCPT ); Thu, 20 Aug 2020 05:31:57 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7F28C22BED; Thu, 20 Aug 2020 09:31:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597915916; bh=S5pOME3zGx4IYjWpdF8CZDVdUnqXcSKVsKmBjXwEE0E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i4sQ+yoCZ5LLPKIv/gBvzkf23r9h8VAfNEhYwB5jEB/pey3NnZ5QdPiDWMCsGTCkc hBC71M5k75sjIALJ21l38SHOsd0gaHobxTTRXTnR3IKp4924y0vsYfB3HKEkF5TYcd aQTBOTsUgMiJY/lJV2H9ciyrIQO8jE1dKI59qYVE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Williams , Dave Jiang , Jane Chu , Vishal Verma , Sasha Levin Subject: [PATCH 5.8 179/232] libnvdimm/security: fix a typo Date: Thu, 20 Aug 2020 11:20:30 +0200 Message-Id: <20200820091621.481053528@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820091612.692383444@linuxfoundation.org> References: <20200820091612.692383444@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jane Chu [ Upstream commit dad42d17558f316e9e807698cd4207359b636084 ] commit d78c620a2e82 ("libnvdimm/security: Introduce a 'frozen' attribute") introduced a typo, causing a 'nvdimm->sec.flags' update being overwritten by the subsequent update meant for 'nvdimm->sec.ext_flags'. Link: https://lore.kernel.org/r/1596494499-9852-1-git-send-email-jane.chu@oracle.com Fixes: d78c620a2e82 ("libnvdimm/security: Introduce a 'frozen' attribute") Cc: Dan Williams Reviewed-by: Dave Jiang Signed-off-by: Jane Chu Signed-off-by: Vishal Verma Signed-off-by: Sasha Levin --- drivers/nvdimm/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvdimm/security.c b/drivers/nvdimm/security.c index 4cef69bd3c1bd..8f3971cf16541 100644 --- a/drivers/nvdimm/security.c +++ b/drivers/nvdimm/security.c @@ -457,7 +457,7 @@ void __nvdimm_security_overwrite_query(struct nvdimm *nvdimm) clear_bit(NDD_WORK_PENDING, &nvdimm->flags); put_device(&nvdimm->dev); nvdimm->sec.flags = nvdimm_security_flags(nvdimm, NVDIMM_USER); - nvdimm->sec.flags = nvdimm_security_flags(nvdimm, NVDIMM_MASTER); + nvdimm->sec.ext_flags = nvdimm_security_flags(nvdimm, NVDIMM_MASTER); } void nvdimm_security_overwrite_query(struct work_struct *work) -- 2.25.1