diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2024-01-05 19:03:06 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2024-01-05 19:03:06 -0800 |
| commit | 80dda9a69a487c72ded1ac69234c8a89d5922b04 (patch) | |
| tree | 24130c9b4980f6a171cbed0d154beaf527a9bfa7 /security/keys/proc.c | |
| parent | d3953c78fc78d37f1b795740632ec7c3d83ef98a (diff) | |
| parent | c7ad3dc3649730af483ee1e78be5d0362da25bfe (diff) | |
Merge branch 'for-6.8/cxl-misc' into for-6.8/cxl
Pick up some miscellaneous fixups for v6.8.
Diffstat (limited to 'security/keys/proc.c')
| -rw-r--r-- | security/keys/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/proc.c b/security/keys/proc.c index d0cde6685627..4f4e2c1824f1 100644 --- a/security/keys/proc.c +++ b/security/keys/proc.c @@ -198,7 +198,7 @@ static int proc_keys_show(struct seq_file *m, void *v) /* come up with a suitable timeout value */ expiry = READ_ONCE(key->expiry); - if (expiry == 0) { + if (expiry == TIME64_MAX) { memcpy(xbuf, "perm", 5); } else if (now >= expiry) { memcpy(xbuf, "expd", 5); |