linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] thunderbolt: Handle NULL boot ACL entries properly
@ 2018-04-30 11:12 Mika Westerberg
  2018-05-01 18:56 ` Yehezkel Bernat
  0 siblings, 1 reply; 3+ messages in thread
From: Mika Westerberg @ 2018-04-30 11:12 UTC (permalink / raw)
  To: linux-kernel
  Cc: Andreas Noever, Michael Jamet, Yehezkel Bernat, 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")
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] thunderbolt: Handle NULL boot ACL entries properly
  2018-04-30 11:12 [PATCH v2] thunderbolt: Handle NULL boot ACL entries properly Mika Westerberg
@ 2018-05-01 18:56 ` Yehezkel Bernat
  2018-05-07 12:20   ` Mika Westerberg
  0 siblings, 1 reply; 3+ messages in thread
From: Yehezkel Bernat @ 2018-05-01 18:56 UTC (permalink / raw)
  To: Mika Westerberg; +Cc: LKML, Andreas Noever, michael.jamet

On Mon, Apr 30, 2018 at 2:12 PM Mika Westerberg <
mika.westerberg@linux.intel.com> 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 <mika.westerberg@linux.intel.com>
> ---
> 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 <yehezkelshb@gmail.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] thunderbolt: Handle NULL boot ACL entries properly
  2018-05-01 18:56 ` Yehezkel Bernat
@ 2018-05-07 12:20   ` Mika Westerberg
  0 siblings, 0 replies; 3+ messages in thread
From: Mika Westerberg @ 2018-05-07 12:20 UTC (permalink / raw)
  To: Yehezkel Bernat; +Cc: LKML, Andreas Noever, michael.jamet

On Tue, May 01, 2018 at 06:56:13PM +0000, Yehezkel Bernat wrote:
> On Mon, Apr 30, 2018 at 2:12 PM Mika Westerberg <
> mika.westerberg@linux.intel.com> 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 <mika.westerberg@linux.intel.com>
> > ---
> > 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 <yehezkelshb@gmail.com>

Applied to thunderbolt.git/fixes.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-05-07 12:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-30 11:12 [PATCH v2] thunderbolt: Handle NULL boot ACL entries properly Mika Westerberg
2018-05-01 18:56 ` Yehezkel Bernat
2018-05-07 12:20   ` Mika Westerberg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).