Skip to contentSkip to conversation

thunderbolt: Handle NULL boot ACL entries properly

PATCH Superseded Mika Westerberg 2 participants 2 messages Apr 27, 2018 – Apr 28, 2018 Thunderbolt driver

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 thunderbolt: Handle NULL boot ACL entries properly

If the boot ACL entry is already NULL we should not fill in the upper two DWs with 0xfffffffff. Otherwise they are not shown as empty entries when the sysfs attribute is read.

Fixes 9aaa3b8b4c56 ("thunderbolt: Add support for preboot ACL")
---
 drivers/thunderbolt/icm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thunderbolt/icm.c +1 -1
index 2d2ceda9aa26..aec6a82989d8 100644
@@ -1255,7 +1255,7 @@ static int icm_ar_get_boot_acl(struct tb *tb, uuid_t *uuids, size_t nuuids)
 			/* Map empty entries to null UUID */
 			uuid[0] = 0;
 			uuid[1] = 0;
-		} else {
+		} else if (uuid[0] != 0 && uuid[1] != 0) {
 			/* Upper two DWs are always one's */
 			uuid[2] = 0xffffffff;
 			uuid[3] = 0xffffffff;
Signature · 1 line
2.17.0
maintainer
#1 lore raw

drivers/thunderbolt/icm.c static int icm_ar_get_boot_acl(struct tb *tb,

Quoted 14 lines · Mika Westerberg

If the boot ACL entry is already NULL we should not fill in the upper two DWs with 0xfffffffff. Otherwise they are not shown as empty entries when the sysfs attribute is read.

Fixes 9aaa3b8b4c56 ("thunderbolt: Add support for preboot ACL")
---
   drivers/thunderbolt/icm.c | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thunderbolt/icm.c +0 -0
index 2d2ceda9aa26..aec6a82989d8 100644
@@ -1255,7 +1255,7 @@ static int icm_ar_get_boot_acl(struct tb *tb,

uuid_t *uuids, size_t nuuids)

drivers/thunderbolt/icm.c static int icm_ar_get_boot_acl(struct tb *tb, uuid_t *uuids, size_t nuuids) · line 1258

Quoted 5 lines
drivers/thunderbolt/icm.c +1 -1
                          /* Map empty entries to null UUID */
                          uuid[0] = 0;
                          uuid[1] = 0;
-               } else {
+               } else if (uuid[0] != 0 && uuid[1] != 0) {

Maybe || instead of &&?
I'd think it's enough for one of them to be non-zero to be a valid UUID.

Quoted 5 lines
drivers/thunderbolt/icm.c +0 -1
                          /* Upper two DWs are always one's */
                          uuid[2] = 0xffffffff;
                          uuid[3] = 0xffffffff;
--

2.17.0