diff options
| author | Dave Jiang <dave.jiang@intel.com> | 2019-03-11 12:47:14 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2019-04-08 09:39:32 -0700 |
| commit | 2170a0d53bee1a6c1a4ebd042f99d85aafc6c0ea (patch) | |
| tree | 4798fc6c3d8ccef6c221824c589924313b996368 /tools/testing/nvdimm/test | |
| parent | 9dc6488e84b0f64df17672271664752488cd6a25 (diff) | |
| download | lwn-2170a0d53bee1a6c1a4ebd042f99d85aafc6c0ea.tar.gz lwn-2170a0d53bee1a6c1a4ebd042f99d85aafc6c0ea.zip | |
tools/testing/nvdimm: Retain security state after overwrite
Overwrite retains the security state after completion of operation. Fix
nfit_test to reflect this so that the kernel can test the behavior it is
more likely to see in practice.
Fixes: 926f74802cb1 ("tools/testing/nvdimm: Add overwrite support for nfit_test")
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'tools/testing/nvdimm/test')
| -rw-r--r-- | tools/testing/nvdimm/test/nfit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/testing/nvdimm/test/nfit.c b/tools/testing/nvdimm/test/nfit.c index cad719876ef4..85ffdcfa596b 100644 --- a/tools/testing/nvdimm/test/nfit.c +++ b/tools/testing/nvdimm/test/nfit.c @@ -146,6 +146,7 @@ static int dimm_fail_cmd_code[ARRAY_SIZE(handle)]; struct nfit_test_sec { u8 state; u8 ext_state; + u8 old_state; u8 passphrase[32]; u8 master_passphrase[32]; u64 overwrite_end_time; @@ -1100,7 +1101,7 @@ static int nd_intel_test_cmd_overwrite(struct nfit_test *t, return 0; } - memset(sec->passphrase, 0, ND_INTEL_PASSPHRASE_SIZE); + sec->old_state = sec->state; sec->state = ND_INTEL_SEC_STATE_OVERWRITE; dev_dbg(dev, "overwrite progressing.\n"); sec->overwrite_end_time = get_jiffies_64() + 5 * HZ; @@ -1122,7 +1123,8 @@ static int nd_intel_test_cmd_query_overwrite(struct nfit_test *t, if (time_is_before_jiffies64(sec->overwrite_end_time)) { sec->overwrite_end_time = 0; - sec->state = 0; + sec->state = sec->old_state; + sec->old_state = 0; sec->ext_state = ND_INTEL_SEC_ESTATE_ENABLED; dev_dbg(dev, "overwrite is complete\n"); } else |