From 8ea4491a56616626e3933f43117bbace995e43d2 Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Fri, 18 Aug 2023 15:24:22 +0100
Subject: [PATCH] fix(abs): some block device use more than int as identifier.

---
 apparmor.d/abstractions/disks-read  | 10 +++++-----
 apparmor.d/abstractions/disks-write | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apparmor.d/abstractions/disks-read b/apparmor.d/abstractions/disks-read
index 9aef7ff34..15567f6e6 100644
--- a/apparmor.d/abstractions/disks-read
+++ b/apparmor.d/abstractions/disks-read
@@ -19,20 +19,20 @@
   @{sys}/devices/pci[0-9]*/**/{usb,ata}[0-9]/** r,
 
   # SSD Nvme devices
-  /dev/nvme* rk,
+  /dev/nvme[0-9]* rk,
   @{sys}/devices/pci[0-9]*/**/nvme/nvme@{int}/{,**} r,
 
   # SD card devices
-  /dev/mmcblk@{int} rk,
-  /dev/mmcblk@{int}p@{int} rk,
+  /dev/mmcblk[0-9]* rk,
+  /dev/mmcblk[0-9]*p@{int} rk,
   @{sys}/devices/pci[0-9]*/**/block/mmcblk@{int}/ r,
   @{sys}/devices/pci[0-9]*/**/block/mmcblk@{int}/** r,
   @{sys}/devices/pci[0-9]*/**/mmc@{int}/mmc*/ r,
   @{sys}/devices/pci[0-9]*/**/mmc@{int}/mmc*/** r,
 
   # Loop devices
-  /dev/loop@{int} rk,
-  /dev/loop@{int}p@{int} rk,
+  /dev/loop[0-9]* rk,
+  /dev/loop[0-9]*p@{int} rk,
   @{sys}/devices/virtual/block/loop@{int}/ r,
   @{sys}/devices/virtual/block/loop@{int}/** r,
 
diff --git a/apparmor.d/abstractions/disks-write b/apparmor.d/abstractions/disks-write
index be9d5dba2..09da6e40c 100644
--- a/apparmor.d/abstractions/disks-write
+++ b/apparmor.d/abstractions/disks-write
@@ -19,20 +19,20 @@
   @{sys}/devices/pci[0-9]*/**/{usb,ata}[0-9]/** r,
 
   # SSD Nvme devices
-  /dev/nvme@{int} rwk,
+  /dev/nvme[0-9]* rwk,
   @{sys}/devices/pci[0-9]*/**/nvme/nvme@{int}/{,**} r,
 
   # SD card devices
-  /dev/mmcblk@{int} rwk,
-  /dev/mmcblk@{int}p@{int} rwk,
+  /dev/mmcblk[0-9]* rwk,
+  /dev/mmcblk[0-9]*p@{int} rwk,
   @{sys}/devices/pci[0-9]*/**/block/mmcblk@{int}/ r,
   @{sys}/devices/pci[0-9]*/**/block/mmcblk@{int}/** r,
   @{sys}/devices/pci[0-9]*/**/mmc@{int}/mmc*/ r,
   @{sys}/devices/pci[0-9]*/**/mmc@{int}/mmc*/** r,
 
   # Loop devices
-  /dev/loop@{int} rwk,
-  /dev/loop@{int}p@{int} rwk,
+  /dev/loop[0-9]* rwk,
+  /dev/loop[0-9]*p@{int} rwk,
   @{sys}/devices/virtual/block/loop@{int}/ r,
   @{sys}/devices/virtual/block/loop@{int}/** r,