Skip to content

Commit

Permalink
[security] Upgrade kernel to 4.9.168-1+deb9u2 (#86)
Browse files Browse the repository at this point in the history
* [security] Upgrade ekernel to 4.9.168-1+deb9u2

* Backport dmi fix from linux-4.16 (#85)

This is just a cosmetic fix for platforms that doesn't provide any DMI
information. Without this patch this raise an error kernel message which
should actually just be a debug one. This patch does just that.

* remove uart race condition patches as both of them are
added to kernel 4.9.168

2019-01-31 uart: Fix crash in uart_write and uart_put_char
2018-09-09 uart: fix race between uart_put_char() and uart_shutdown()

Signed-off-by: Guohan Lu <gulv@microsoft.com>

* Add downloadable kernel packages
  • Loading branch information
qiluo-msft authored and lguohan committed Jun 10, 2019
1 parent 9bcb2d9 commit e57148b
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 245 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ SHELL = /bin/bash
.SHELLFLAGS += -e

KERNEL_ABI_MINOR_VERSION = 2
KVERSION_SHORT ?= 4.9.0-8-$(KERNEL_ABI_MINOR_VERSION)
KVERSION_SHORT ?= 4.9.0-9-$(KERNEL_ABI_MINOR_VERSION)
KVERSION ?= $(KVERSION_SHORT)-amd64
KERNEL_VERSION ?= 4.9.110
KERNEL_SUBVERSION ?= 3+deb9u6
KERNEL_VERSION ?= 4.9.168
KERNEL_SUBVERSION ?= 1+deb9u2
kernel_procure_method ?= build

LINUX_HEADER_COMMON = linux-headers-$(KVERSION_SHORT)-common_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_all.deb
Expand All @@ -20,11 +20,11 @@ ifneq ($(kernel_procure_method), build)
# Downloading kernel

# TBD, need upload the new kernel packages
LINUX_HEADER_COMMON_URL = "https://sonicstorage.blob.core.windows.net/packages/kernel-public/linux-headers-$(KVERSION_SHORT)-common_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_all.deb?sv=2015-04-05&sr=b&sig=LlKqKecY6MDSwFMTxpKErh7FX1Lrvse2yVt3niYnhds%3D&se=2128-02-24T04%3A47%3A48Z&sp=r"
LINUX_HEADER_COMMON_URL = "https://sonicstorage.blob.core.windows.net/packages/kernel-public/linux-headers-$(KVERSION_SHORT)-common_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_all.deb?sv=2015-04-05&sr=b&sig=kly2kchVaAvaRSolXeLP2%2BKoIJupq2RzaN3nCvlZIK0%3D&se=2128-12-14T21%3A52%3A45Z&sp=r"

LINUX_HEADER_AMD64_URL = "https://sonicstorage.blob.core.windows.net/packages/kernel-public/linux-headers-$(KVERSION_SHORT)-amd64_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_amd64.deb?sv=2015-04-05&sr=b&sig=SfQLjiBPPMcRUOmBPvXq2%2F6SsW3ul9%2FlaROplXdGij0%3D&se=2128-02-24T04%3A48%3A38Z&sp=r"
LINUX_HEADER_AMD64_URL = "https://sonicstorage.blob.core.windows.net/packages/kernel-public/linux-headers-$(KVERSION_SHORT)-amd64_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_amd64.deb?sv=2015-04-05&sr=b&sig=gUahX%2BMmA0X4brlybxlphmu%2FTBvsclIS611iUxtDJOM%3D&se=2128-12-14T21%3A51%3A51Z&sp=r"

LINUX_IMAGE_URL = "https://sonicstorage.blob.core.windows.net/packages/kernel-public/linux-image-$(KVERSION_SHORT)-amd64_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_amd64.deb?sv=2015-04-05&sr=b&sig=PNKGpLjELZem0IacUMM1jU%2Ft5ujoVvUb9JzxrUhE1Wk%3D&se=2128-02-24T04%3A48%3A57Z&sp=r"
LINUX_IMAGE_URL = "https://sonicstorage.blob.core.windows.net/packages/kernel-public/linux-image-$(KVERSION_SHORT)-amd64_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_amd64.deb?sv=2015-04-05&sr=b&sig=QUoD1oTuz%2FQB2DjEchG%2FclBGxNyj4E5z%2FJzZFOpNgu0%3D&se=2128-12-14T21%3A52%3A27Z&sp=r"

$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Obtaining the Debian kernel packages
Expand Down

This file was deleted.

This file was deleted.

8 changes: 4 additions & 4 deletions patch/preconfig/changelog.patch
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ index 026b840..88c8a43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+linux (4.9.110-3+deb9u6) sonic; urgency=high
+linux (4.9.168-1+deb9u2) sonic; urgency=high
+
+ * add driver patches for MLNX SN2700
+
+ -- Guohan Lu <gulv@microsoft.com> Sun, 19 Dec 2015 01:50:04 +0100
+
+linux (4.9.110-3+deb9u6) sonic; urgency=high
+linux (4.9.168-1+deb9u2) sonic; urgency=high
+
+ * add support for S6000
+
+ -- Shuotian Cheng <shuche@microsoft.com> Sun, 19 Dec 2015 01:50:04 +0100
+
linux (4.9.110-3+deb9u6) stretch-security; urgency=high
linux (4.9.168-1+deb9u2) stretch-security; urgency=high

* [arm64] KVM: Tighten guest core register access from userspace
[ Salvatore Bonaccorso ]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Update debian abiname to 8-2
Update debian abiname to 9-2

From: Guohan Lu <gulv@microsoft.com>

Expand All @@ -13,8 +13,8 @@ index cfc4409..fae58f7 100644
+++ b/debian/config/defines
@@ -1,5 +1,5 @@
[abi]
-abiname: 8
+abiname: 8-2
-abiname: 9
+abiname: 9-2
ignore-changes:
__cpuhp_*
bpf_analyzer
2 changes: 1 addition & 1 deletion patch/preconfig/series
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
changelog.patch
packaging-update-abiname-to-8-2.patch
packaging-update-abiname-to-9-2.patch
2 changes: 0 additions & 2 deletions patch/series
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ driver-sff-8436-use-nvmem-framework.patch
driver-sff-8436-use-nvmem_device_read.patch
driver-support-sff-8436-read-write-fix.patch
driver-i2c-bus-intel-ismt-add-delay-param.patch
driver-uart-fix-race-between-uart_put_char-and-uart_shutdow.patch
driver-uart-fix-another-race-between-uart_put_char-and-uart_shutdow.patch
driver-pca954x-i2c-mux-force-deselect-on-exit-flag.patch
driver-l3mdev-cgroup.patch
kernel-add-kexec-reboot-string.patch
Expand Down

0 comments on commit e57148b

Please sign in to comment.