[SRU][AWS] disable Bluetooth for linux-aws

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
9 messages Options
Reply | Threaded
Open this post in threaded view
|

[SRU][AWS] disable Bluetooth for linux-aws

Kamal Mostafa-2
BugLink: https://bugs.launchpad.net/bugs/1840488

Bluetooth is not needed for linux-aws kernels; disable it to reduce
attack surface.  Multiple dependent BT drivers also get removed.

Some or both arches of linux-aws/{B,F,G,H} need CONFIG_BT to be
disabled; previous linux-aws series already had it disabled.

 -Kamal

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[SRU][AWS/B][PATCH] UBUNTU: aws: [Config] disable CONFIG_BT

Kamal Mostafa-2
BugLink: https://bugs.launchpad.net/bugs/1840488

Signed-off-by: Kamal Mostafa <[hidden email]>
---
 debian.aws/config/amd64/config.common.amd64 |  1 -
 debian.aws/config/annotations               |  2 +-
 debian.aws/config/arm64/config.common.arm64 |  1 -
 debian.aws/config/config.common.ubuntu      | 46 +--------------------
 4 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/debian.aws/config/amd64/config.common.amd64 b/debian.aws/config/amd64/config.common.amd64
index 9a160243858b..37b751b9396f 100644
--- a/debian.aws/config/amd64/config.common.amd64
+++ b/debian.aws/config/amd64/config.common.amd64
@@ -52,7 +52,6 @@ CONFIG_ATA_PIIX=y
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_RT5033 is not set
 # CONFIG_BATTERY_SBS is not set
-# CONFIG_BT is not set
 # CONFIG_CHARGER_AXP20X is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_DA9150 is not set
diff --git a/debian.aws/config/annotations b/debian.aws/config/annotations
index c4482a857684..9e9c09a57d94 100644
--- a/debian.aws/config/annotations
+++ b/debian.aws/config/annotations
@@ -9868,7 +9868,7 @@ CONFIG_BT_BNEP_MC_FILTER                        policy<{'amd64': 'y', 'arm64': '
 CONFIG_BT_BNEP_PROTO_FILTER                     policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
 CONFIG_BT_CMTP                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_BT_HIDP                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
-CONFIG_BT_HS                                    policy<{'amd64': '-', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
+CONFIG_BT_HS                                    policy<{'amd64': '-', 'arm64': '-', 'armhf': '-', 'i386': '-', 'ppc64el': '-'}>
 CONFIG_BT_HS                                    mark<ENFORCED> note<https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00435.html>
 
 # Menu: Networking support >> Bluetooth subsystem support >> Bluetooth device drivers
diff --git a/debian.aws/config/arm64/config.common.arm64 b/debian.aws/config/arm64/config.common.arm64
index fc9d92973ee3..8310e56e95f7 100644
--- a/debian.aws/config/arm64/config.common.arm64
+++ b/debian.aws/config/arm64/config.common.arm64
@@ -52,7 +52,6 @@ CONFIG_BATTERY_MAX17040=m
 CONFIG_BATTERY_MAX17042=m
 CONFIG_BATTERY_RT5033=m
 CONFIG_BATTERY_SBS=m
-CONFIG_BT=m
 CONFIG_CHARGER_AXP20X=m
 CONFIG_CHARGER_BQ2415X=m
 CONFIG_CHARGER_DA9150=m
diff --git a/debian.aws/config/config.common.ubuntu b/debian.aws/config/config.common.ubuntu
index 4f0b92335623..87a4329e4204 100644
--- a/debian.aws/config/config.common.ubuntu
+++ b/debian.aws/config/config.common.ubuntu
@@ -886,6 +886,7 @@ CONFIG_BROADCOM_PHY=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_BT is not set
 CONFIG_BTREE=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_DEBUG is not set
@@ -895,51 +896,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 CONFIG_BTT=y
-CONFIG_BT_6LOWPAN=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_BCM=m
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_DEBUGFS=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_BCM=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_MRVL=y
-CONFIG_BT_HCIUART_NOKIA=m
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIUART_SERDEV=y
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_HIDP=m
-# CONFIG_BT_HS is not set
-CONFIG_BT_INTEL=m
-CONFIG_BT_LE=y
-CONFIG_BT_LEDS=y
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_QCA=m
-CONFIG_BT_QCOMSMD=m
-# CONFIG_BT_QCOMSMD_HACK is not set
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_RTL=m
-# CONFIG_BT_SELFTEST is not set
-CONFIG_BT_WILINK=m
 CONFIG_BUG=y
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 CONFIG_BUILDTIME_EXTABLE_SORT=y
--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[SRU][AWS/F][PATCH] UBUNTU: aws: [Config] disable CONFIG_BT

Kamal Mostafa-2
In reply to this post by Kamal Mostafa-2
BugLink: https://bugs.launchpad.net/bugs/1840488

Signed-off-by: Kamal Mostafa <[hidden email]>
---
 debian.aws/config/amd64/config.common.amd64 |  1 -
 debian.aws/config/annotations               |  2 +-
 debian.aws/config/arm64/config.common.arm64 |  1 -
 debian.aws/config/config.common.ubuntu      | 52 +--------------------
 4 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/debian.aws/config/amd64/config.common.amd64 b/debian.aws/config/amd64/config.common.amd64
index 21c8e018f806..09092ce1dfd9 100644
--- a/debian.aws/config/amd64/config.common.amd64
+++ b/debian.aws/config/amd64/config.common.amd64
@@ -48,7 +48,6 @@ CONFIG_ATA_PIIX=y
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_RT5033 is not set
 # CONFIG_BATTERY_SBS is not set
-# CONFIG_BT is not set
 # CONFIG_CHARGER_AXP20X is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_DA9150 is not set
diff --git a/debian.aws/config/annotations b/debian.aws/config/annotations
index b2eb02e697b5..6108dd10457c 100644
--- a/debian.aws/config/annotations
+++ b/debian.aws/config/annotations
@@ -9872,7 +9872,7 @@ CONFIG_BT_BNEP_MC_FILTER                        policy<{'amd64': 'y', 'arm64': '
 CONFIG_BT_BNEP_PROTO_FILTER                     policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
 CONFIG_BT_CMTP                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_BT_HIDP                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
-CONFIG_BT_HS                                    policy<{'amd64': '-', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
+CONFIG_BT_HS                                    policy<{'amd64': '-', 'arm64': '-', 'armhf': '-', 'i386': '-', 'ppc64el': '-'}>
 CONFIG_BT_HS                                    mark<ENFORCED> note<https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00435.html>
 
 # Menu: Networking support >> Bluetooth subsystem support >> Bluetooth device drivers
diff --git a/debian.aws/config/arm64/config.common.arm64 b/debian.aws/config/arm64/config.common.arm64
index 2cf4d578aacd..321dcbd9ed3a 100644
--- a/debian.aws/config/arm64/config.common.arm64
+++ b/debian.aws/config/arm64/config.common.arm64
@@ -48,7 +48,6 @@ CONFIG_BATTERY_MAX17040=m
 CONFIG_BATTERY_MAX17042=m
 CONFIG_BATTERY_RT5033=m
 CONFIG_BATTERY_SBS=m
-CONFIG_BT=m
 CONFIG_CHARGER_AXP20X=m
 CONFIG_CHARGER_BQ2415X=m
 CONFIG_CHARGER_DA9150=m
diff --git a/debian.aws/config/config.common.ubuntu b/debian.aws/config/config.common.ubuntu
index 1ae7ea63b257..2e7fb647448e 100644
--- a/debian.aws/config/config.common.ubuntu
+++ b/debian.aws/config/config.common.ubuntu
@@ -979,6 +979,7 @@ CONFIG_BROADCOM_PHY=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_BT is not set
 CONFIG_BTREE=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_DEBUG is not set
@@ -988,56 +989,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 CONFIG_BTT=y
-CONFIG_BT_6LOWPAN=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_BCM=m
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_DEBUGFS=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIBTUSB=m
-# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_MTK=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIRSI=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_BCM=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_MRVL=y
-CONFIG_BT_HCIUART_NOKIA=m
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIUART_RTL=y
-CONFIG_BT_HCIUART_SERDEV=y
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_HIDP=m
-# CONFIG_BT_HS is not set
-CONFIG_BT_INTEL=m
-CONFIG_BT_LE=y
-CONFIG_BT_LEDS=y
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKSDIO=m
-CONFIG_BT_MTKUART=m
-CONFIG_BT_QCA=m
-CONFIG_BT_QCOMSMD=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_RTL=m
-# CONFIG_BT_SELFTEST is not set
-CONFIG_BT_WILINK=m
 CONFIG_BUG=y
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -6997,7 +6948,6 @@ CONFIG_RPR0521=m
 CONFIG_RPS=y
 CONFIG_RSEQ=y
 CONFIG_RSI_91X=m
-CONFIG_RSI_COEX=y
 # CONFIG_RSI_DEBUGFS is not set
 CONFIG_RSI_SDIO=m
 CONFIG_RSI_USB=m
--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[SRU][AWS/G][PATCH] UBUNTU: aws: [Config] disable CONFIG_BT

Kamal Mostafa-2
In reply to this post by Kamal Mostafa-2
BugLink: https://bugs.launchpad.net/bugs/1840488

Signed-off-by: Kamal Mostafa <[hidden email]>
---
 debian.aws/config/annotations          |  2 +-
 debian.aws/config/config.common.ubuntu | 59 +-------------------------
 2 files changed, 2 insertions(+), 59 deletions(-)

diff --git a/debian.aws/config/annotations b/debian.aws/config/annotations
index d50846265497..67510553b976 100644
--- a/debian.aws/config/annotations
+++ b/debian.aws/config/annotations
@@ -10805,7 +10805,7 @@ CONFIG_BT_BNEP_MC_FILTER                        policy<{'amd64': 'y', 'arm64': '
 CONFIG_BT_BNEP_PROTO_FILTER                     policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
 CONFIG_BT_CMTP                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_BT_HIDP                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_BT_HS                                    policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
+CONFIG_BT_HS                                    policy<{'amd64': '-', 'arm64': '-', 'armhf': '-', 'ppc64el': '-'}>
 CONFIG_BT_HS                                    mark<ENFORCED> note<https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00435.html>
 
 # Menu: Networking support >> Bluetooth subsystem support >> Bluetooth device drivers
diff --git a/debian.aws/config/config.common.ubuntu b/debian.aws/config/config.common.ubuntu
index f26d89553d97..f431da9d9261 100644
--- a/debian.aws/config/config.common.ubuntu
+++ b/debian.aws/config/config.common.ubuntu
@@ -1101,7 +1101,7 @@ CONFIG_BROADCOM_PHY=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_BT=m
+# CONFIG_BT is not set
 CONFIG_BTREE=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_DEBUG is not set
@@ -1111,59 +1111,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 CONFIG_BTT=y
-CONFIG_BT_6LOWPAN=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_BCM=m
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_DEBUGFS=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_MTK=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIRSI=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_BCM=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_MRVL=y
-CONFIG_BT_HCIUART_NOKIA=m
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIUART_RTL=y
-CONFIG_BT_HCIUART_SERDEV=y
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_HIDP=m
-# CONFIG_BT_HS is not set
-CONFIG_BT_INTEL=m
-CONFIG_BT_LE=y
-CONFIG_BT_LEDS=y
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MSFTEXT=y
-CONFIG_BT_MTKSDIO=m
-CONFIG_BT_MTKUART=m
-CONFIG_BT_QCA=m
-CONFIG_BT_QCOMSMD=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_RTL=m
-# CONFIG_BT_SELFTEST is not set
 CONFIG_BUG=y
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 CONFIG_BUILDTIME_TABLE_SORT=y
@@ -1239,7 +1186,6 @@ CONFIG_CAN_UCAN=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
 CONFIG_CAN_XILINXCAN=m
-CONFIG_CAPI_TRACE=y
 CONFIG_CARDBUS=y
 CONFIG_CARDMAN_4000=m
 CONFIG_CARDMAN_4040=m
@@ -4685,8 +4631,6 @@ CONFIG_ISCSI_TARGET=m
 CONFIG_ISCSI_TARGET_CXGB4=m
 CONFIG_ISCSI_TCP=m
 CONFIG_ISDN=y
-CONFIG_ISDN_CAPI=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISI=m
 CONFIG_ISL29003=m
 CONFIG_ISL29020=m
@@ -7781,7 +7725,6 @@ CONFIG_RPR0521=m
 CONFIG_RPS=y
 CONFIG_RSEQ=y
 CONFIG_RSI_91X=m
-CONFIG_RSI_COEX=y
 # CONFIG_RSI_DEBUGFS is not set
 CONFIG_RSI_SDIO=m
 CONFIG_RSI_USB=m
--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[SRU][AWS/H][PATCH] UBUNTU: aws: [Config] disable CONFIG_BT

Kamal Mostafa-2
In reply to this post by Kamal Mostafa-2
BugLink: https://bugs.launchpad.net/bugs/1840488

Signed-off-by: Kamal Mostafa <[hidden email]>
---
 debian.aws-21.04/config/annotations          |  2 +-
 debian.aws-21.04/config/config.common.ubuntu | 59 +-------------------
 2 files changed, 2 insertions(+), 59 deletions(-)

diff --git a/debian.aws-21.04/config/annotations b/debian.aws-21.04/config/annotations
index d50846265497..67510553b976 100644
--- a/debian.aws-21.04/config/annotations
+++ b/debian.aws-21.04/config/annotations
@@ -10805,7 +10805,7 @@ CONFIG_BT_BNEP_MC_FILTER                        policy<{'amd64': 'y', 'arm64': '
 CONFIG_BT_BNEP_PROTO_FILTER                     policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
 CONFIG_BT_CMTP                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_BT_HIDP                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_BT_HS                                    policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
+CONFIG_BT_HS                                    policy<{'amd64': '-', 'arm64': '-', 'armhf': '-', 'ppc64el': '-'}>
 CONFIG_BT_HS                                    mark<ENFORCED> note<https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00435.html>
 
 # Menu: Networking support >> Bluetooth subsystem support >> Bluetooth device drivers
diff --git a/debian.aws-21.04/config/config.common.ubuntu b/debian.aws-21.04/config/config.common.ubuntu
index f26d89553d97..f431da9d9261 100644
--- a/debian.aws-21.04/config/config.common.ubuntu
+++ b/debian.aws-21.04/config/config.common.ubuntu
@@ -1101,7 +1101,7 @@ CONFIG_BROADCOM_PHY=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_BT=m
+# CONFIG_BT is not set
 CONFIG_BTREE=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_DEBUG is not set
@@ -1111,59 +1111,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 CONFIG_BTT=y
-CONFIG_BT_6LOWPAN=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_BCM=m
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_DEBUGFS=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_MTK=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIRSI=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_BCM=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_MRVL=y
-CONFIG_BT_HCIUART_NOKIA=m
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIUART_RTL=y
-CONFIG_BT_HCIUART_SERDEV=y
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_HIDP=m
-# CONFIG_BT_HS is not set
-CONFIG_BT_INTEL=m
-CONFIG_BT_LE=y
-CONFIG_BT_LEDS=y
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MSFTEXT=y
-CONFIG_BT_MTKSDIO=m
-CONFIG_BT_MTKUART=m
-CONFIG_BT_QCA=m
-CONFIG_BT_QCOMSMD=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_RTL=m
-# CONFIG_BT_SELFTEST is not set
 CONFIG_BUG=y
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 CONFIG_BUILDTIME_TABLE_SORT=y
@@ -1239,7 +1186,6 @@ CONFIG_CAN_UCAN=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
 CONFIG_CAN_XILINXCAN=m
-CONFIG_CAPI_TRACE=y
 CONFIG_CARDBUS=y
 CONFIG_CARDMAN_4000=m
 CONFIG_CARDMAN_4040=m
@@ -4685,8 +4631,6 @@ CONFIG_ISCSI_TARGET=m
 CONFIG_ISCSI_TARGET_CXGB4=m
 CONFIG_ISCSI_TCP=m
 CONFIG_ISDN=y
-CONFIG_ISDN_CAPI=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISI=m
 CONFIG_ISL29003=m
 CONFIG_ISL29020=m
@@ -7781,7 +7725,6 @@ CONFIG_RPR0521=m
 CONFIG_RPS=y
 CONFIG_RSEQ=y
 CONFIG_RSI_91X=m
-CONFIG_RSI_COEX=y
 # CONFIG_RSI_DEBUGFS is not set
 CONFIG_RSI_SDIO=m
 CONFIG_RSI_USB=m
--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [SRU][AWS] disable Bluetooth for linux-aws

Andrea Righi
In reply to this post by Kamal Mostafa-2
On Fri, Jan 22, 2021 at 01:40:55PM -0800, Kamal Mostafa wrote:
> BugLink: https://bugs.launchpad.net/bugs/1840488
>
> Bluetooth is not needed for linux-aws kernels; disable it to reduce
> attack surface.  Multiple dependent BT drivers also get removed.
>
> Some or both arches of linux-aws/{B,F,G,H} need CONFIG_BT to be
> disabled; previous linux-aws series already had it disabled.
>
>  -Kamal

Totally makes sense to me. Thanks!

Acked-by: Andrea Righi <[hidden email]>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [SRU][AWS] disable Bluetooth for linux-aws

Marcelo Henrique Cerri
In reply to this post by Kamal Mostafa-2
Hi, Kamal.

Why not annotate and enforce CONFIG_BT as "n"?

On Fri, Jan 22, 2021 at 01:40:55PM -0800, Kamal Mostafa wrote:

> BugLink: https://bugs.launchpad.net/bugs/1840488
>
> Bluetooth is not needed for linux-aws kernels; disable it to reduce
> attack surface.  Multiple dependent BT drivers also get removed.
>
> Some or both arches of linux-aws/{B,F,G,H} need CONFIG_BT to be
> disabled; previous linux-aws series already had it disabled.
>
>  -Kamal
>
> --
> kernel-team mailing list
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
--
Regards,
Marcelo


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (673 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [SRU][AWS] disable Bluetooth for linux-aws

Stefan Bader-2
In reply to this post by Kamal Mostafa-2
On 22.01.21 22:40, Kamal Mostafa wrote:

> BugLink: https://bugs.launchpad.net/bugs/1840488
>
> Bluetooth is not needed for linux-aws kernels; disable it to reduce
> attack surface.  Multiple dependent BT drivers also get removed.
>
> Some or both arches of linux-aws/{B,F,G,H} need CONFIG_BT to be
> disabled; previous linux-aws series already had it disabled.
>
>  -Kamal
>
Not sure, but according to my inbox this is kind of pending to say something
about enforcing the generic BT=n setting.

-Stefan


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

NAK: [SRU][AWS] disable Bluetooth for linux-aws

Kamal Mostafa-2
In reply to this post by Kamal Mostafa-2
v2 with annotation enforcement is forthcoming.

 -Kamal.

On Fri, Jan 22, 2021 at 01:40:55PM -0800, Kamal Mostafa wrote:
> BugLink: https://bugs.launchpad.net/bugs/1840488
>
> Bluetooth is not needed for linux-aws kernels; disable it to reduce
> attack surface.  Multiple dependent BT drivers also get removed.
>
> Some or both arches of linux-aws/{B,F,G,H} need CONFIG_BT to be
> disabled; previous linux-aws series already had it disabled.
>
>  -Kamal

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team