2018-04-30 11:13:15

by Mika Westerberg

Subject: [PATCH v2] 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")
Signed-off-by: Mika Westerberg <[email protected]>
---
Changes from v1 (https://lkml.org/lkml/2018/4/27/845):

* Use || instead of && to make sure UUIDs with only one zero DW
are still treated as valid.

drivers/thunderbolt/icm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
index 2d2ceda9aa26..500911f16498 100644
--- a/drivers/thunderbolt/icm.c
+++ b/drivers/thunderbolt/icm.c
@@ -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;
--
2.17.0

2018-05-01 18:57:01

by Yehezkel Bernat

Subject: Re: [PATCH v2] thunderbolt: Handle NULL boot ACL entries properly

On Mon, Apr 30, 2018 at 2:12 PM Mika Westerberg <
[email protected]> wrote:

> 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")
> Signed-off-by: Mika Westerberg <[email protected]>
> ---
> Changes from v1 (https://lkml.org/lkml/2018/4/27/845):

> * Use || instead of && to make sure UUIDs with only one zero DW
> are still treated as valid.

> drivers/thunderbolt/icm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

> diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
> index 2d2ceda9aa26..500911f16498 100644
> --- a/drivers/thunderbolt/icm.c
> +++ b/drivers/thunderbolt/icm.c
> @@ -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;
> --
> 2.17.0


Acked-by: Yehezkel Bernat <[email protected]>

2018-05-07 12:21:11

by Mika Westerberg

Subject: Re: [PATCH v2] thunderbolt: Handle NULL boot ACL entries properly

On Tue, May 01, 2018 at 06:56:13PM +0000, Yehezkel Bernat wrote:
> On Mon, Apr 30, 2018 at 2:12 PM Mika Westerberg <
> [email protected]> wrote:
>
> > 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")
> > Signed-off-by: Mika Westerberg <[email protected]>
> > ---
> > Changes from v1 (https://lkml.org/lkml/2018/4/27/845):
>
> > * Use || instead of && to make sure UUIDs with only one zero DW
> > are still treated as valid.
>
> > drivers/thunderbolt/icm.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
>
> > diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
> > index 2d2ceda9aa26..500911f16498 100644
> > --- a/drivers/thunderbolt/icm.c
> > +++ b/drivers/thunderbolt/icm.c
> > @@ -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;
> > --
> > 2.17.0
>
>
> Acked-by: Yehezkel Bernat <[email protected]>

Applied to thunderbolt.git/fixes.