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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,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 A9DCDC433E1 for ; Thu, 20 Aug 2020 12:56:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 798A820658 for ; Thu, 20 Aug 2020 12:56:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597928183; bh=KGzPf/rdCRUwBSQBvzEttjBkAfBjvfkrfl5505s+/ic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wiMH4Pd2/UgdzvklwhWAaFo829tbwvInvubAhcFmS89IOkm6iD41TX36ad82/p7Uo M9zgdismQPhQMsAvZroz5US+E8wTLJXLCJPcCqnKr7xxzVS3BiiP3NHWQBQyvUqP6G BebHGoAT2DwGrxEyEJuskwkkFpW/GqODk9MMEmW0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727066AbgHTM4W (ORCPT ); Thu, 20 Aug 2020 08:56:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:36016 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729114AbgHTJlz (ORCPT ); Thu, 20 Aug 2020 05:41:55 -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 B7D1020724; Thu, 20 Aug 2020 09:41:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597916514; bh=KGzPf/rdCRUwBSQBvzEttjBkAfBjvfkrfl5505s+/ic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=urh7Wwn9yX4CHYoe9w0EdM03pjaPGSagVeqTO2uwG8/gtcp3ILR6Vm0VVholJm0lo cjJnHHWKQuTeD5X1fXCN0QTdGltu3kOwspzjEayCTR53oiK0HHQ0dWTOflsjxaK3ma Gvt+iT9xLJuXjOReuF43CH/4AvcYo3ALMWzKyv0s= 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.7 153/204] libnvdimm/security: fix a typo Date: Thu, 20 Aug 2020 11:20:50 +0200 Message-Id: <20200820091613.883056922@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820091606.194320503@linuxfoundation.org> References: <20200820091606.194320503@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 89b85970912db..acfd211c01b9c 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