]> www.infradead.org Git - linux.git/commitdiff
cxl/pci: Fix lockdown level
authorDan Williams <dan.j.williams@intel.com>
Sat, 4 Sep 2021 02:20:45 +0000 (19:20 -0700)
committerDan Williams <dan.j.williams@intel.com>
Tue, 7 Sep 2021 18:39:01 +0000 (11:39 -0700)
A proposed rework of security_locked_down() users identified that the
cxl_pci driver was passing the wrong lockdown_reason. Update
cxl_mem_raw_command_allowed() to fail raw command access when raw pci
access is also disabled.

Fixes: 13237183c735 ("cxl/mem: Add a "RAW" send command")
Cc: Ben Widawsky <ben.widawsky@intel.com>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: <stable@vger.kernel.org>
Cc: Ondrej Mosnacek <omosnace@redhat.com>
Cc: Paul Moore <paul@paul-moore.com>
Link: https://lore.kernel.org/r/163072204525.2250120.16615792476976546735.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
drivers/cxl/pci.c

index 651e8d4ec9749de1d8c9bf3a51badfde31ca620a..37903259ee79dac9e21eef4dfc5004ee0a065bf3 100644 (file)
@@ -575,7 +575,7 @@ static bool cxl_mem_raw_command_allowed(u16 opcode)
        if (!IS_ENABLED(CONFIG_CXL_MEM_RAW_COMMANDS))
                return false;
 
-       if (security_locked_down(LOCKDOWN_NONE))
+       if (security_locked_down(LOCKDOWN_PCI_ACCESS))
                return false;
 
        if (cxl_raw_allow_all)