matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[sonic-linux-kernel]: kernel security update to 4.9.246 (#6545)

Browse Source 
* [sonic-linux-kernel]: kernel security update to 4.9.246
* [Arista] Update driver submodule (#60)
     Update kernel dependency to 4.9.0-14-2

Signed-off-by: Guohan Lu <lguohan@gmail.com>
Co-authored-by: Samuel Angebault <angebault.samuel@gmail.com>
This commit is contained in:
lguohan 2021-01-28 08:46:07 -08:00 committed by GitHub
parent 95bcefa7c9
commit fcf93dda12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_debian.sh
View File

@ -37,7 +37,7 @@ if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
else
DOCKER_VERSION=5:18.09.8~3-0~debian-stretch
fi
LINUX_KERNEL_VERSION=4.9.0-11-2
LINUX_KERNEL_VERSION=4.9.0-14-2
## Working directory to prepare the file system
FILESYSTEM_ROOT=./fsroot

2
files/build_templates/per_namespace/swss.service.j2
View File

@ -9,7 +9,7 @@ After=topology.service
{% if sonic_asic_platform == 'broadcom' %}
Requires=opennsl-modules.service
{% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-11-2-amd64.service
Requires=nps-modules-4.9.0-14-2-amd64.service
{% endif %}
Requires=updategraph.service
After=updategraph.service

4
files/build_templates/per_namespace/syncd.service.j2
View File

@ -11,8 +11,8 @@ After=topology.service
Requires=opennsl-modules.service
After=opennsl-modules.service
{% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-11-2-amd64.service
After=nps-modules-4.9.0-11-2-amd64.service
Requires=nps-modules-4.9.0-14-2-amd64.service
After=nps-modules-4.9.0-14-2-amd64.service
{% endif %}
Requires=updategraph.service
After=updategraph.service

4
installer/x86_64/install.sh
View File

@ -624,12 +624,12 @@ menuentry '$demo_grub_entry' {
if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi
insmod part_msdos
insmod ext2
linux /$image_dir/boot/vmlinuz-4.9.0-11-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
linux /$image_dir/boot/vmlinuz-4.9.0-14-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
net.ifnames=0 biosdevname=0 \
loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs \
apparmor=1 security=apparmor varlog_size=$VAR_LOG_SIZE usbcore.autosuspend=-1 $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX
echo 'Loading $demo_volume_label $demo_type initial ramdisk ...'
initrd /$image_dir/boot/initrd.img-4.9.0-11-2-amd64
initrd /$image_dir/boot/initrd.img-4.9.0-14-2-amd64
}
EOF

2
platform/barefoot/bfn-modules/debian/control
View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: bfn-modules
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for bfn asic for mmap

2
platform/barefoot/sonic-platform-modules-arista

@ -1 +1 @@
Subproject commit 79b7d11b61c5eec2b4a38a6414417b7b4f064aab
Subproject commit 7386823e6e65bd65d80c60b499b50d81af5b311f

2
platform/barefoot/sonic-platform-modules-bfn-montara/debian/control
View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: sonic-platform-modules-bfn-montara
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

4
platform/barefoot/sonic-platform-modules-bfn-newport/debian/control
View File

@ -7,11 +7,11 @@ Standards-Version: 3.9.3
Package: sonic-platform-modules-bfn-newport-as9516
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel module for bfn platform fpga and scripts for the devices such as fan, led, sfp
Package: sonic-platform-modules-bfn-newport-as9516bf
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel module for bfn platform fpga and scripts for the devices such as fan, led, sfp

2
platform/barefoot/sonic-platform-modules-bfn/debian/control
View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: sonic-platform-modules-bfn
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

2
platform/broadcom/sai-modules.mk
View File

@ -1,6 +1,6 @@
# Broadcom SAI modules
KVERSION = 4.9.0-11-2-amd64
KVERSION = 4.9.0-14-2-amd64
BRCM_OPENNSL_KERNEL_VERSION = 3.7.5.2-1
BRCM_OPENNSL_KERNEL = opennsl-modules_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb

2
platform/broadcom/saibcm-modules/debian/control
View File

@ -10,5 +10,5 @@ Standards-Version: 3.9.3
Package: opennsl-modules
Architecture: amd64
Section: main
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for broadcom SAI

2
platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs
View File

@ -1 +1 @@
lib/modules/4.9.0-11-2-amd64/extra
lib/modules/4.9.0-14-2-amd64/extra

10
platform/broadcom/saibcm-modules/debian/opennsl-modules.install
View File

@ -1,6 +1,6 @@
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-11-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-11-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-11-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-11-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/psample.ko lib/modules/4.9.0-11-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-14-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-14-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-14-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-14-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/psample.ko lib/modules/4.9.0-14-2-amd64/extra
systemd/opennsl-modules.service lib/systemd/system

6
platform/broadcom/saibcm-modules/debian/rules
View File

@ -60,7 +60,7 @@ kdist_config: prep-deb-files
kdist_clean: clean
dh_testdir
dh_clean
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 BUILD_PSAMPLE=1 KERNDIR=/usr/src/linux-headers-4.9.0-11-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-11-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 BUILD_PSAMPLE=1 KERNDIR=/usr/src/linux-headers-4.9.0-14-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-14-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
# rm -f driver/*.o driver/*.ko
#
### end KERNEL SETUP
@ -78,7 +78,7 @@ build-arch-stamp:
dh_testdir
# Add here command to compile/build the package.
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 BUILD_PSAMPLE=1 KERNDIR=/usr/src/linux-headers-4.9.0-11-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-11-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 BUILD_PSAMPLE=1 KERNDIR=/usr/src/linux-headers-4.9.0-14-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-14-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6
touch $@
@ -103,7 +103,7 @@ clean:
rm -f build-arch-stamp build-indep-stamp configure-stamp
# Add here commands to clean up after the build process.
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 BUILD_PSAMPLE=1 KERNDIR=/usr/src/linux-headers-4.9.0-11-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-11-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 BUILD_PSAMPLE=1 KERNDIR=/usr/src/linux-headers-4.9.0-14-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-14-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
dh_clean

4
platform/broadcom/sonic-platform-modules-alphanetworks/debian/control
View File

@ -7,11 +7,11 @@ Standards-Version: 3.9.3
Package: sonic-platform-alphanetworks-snh60a0-320fv2
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: sonic-platform-alphanetworks-snh60b0-640f
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

2
platform/broadcom/sonic-platform-modules-arista

@ -1 +1 @@
Subproject commit 79b7d11b61c5eec2b4a38a6414417b7b4f064aab
Subproject commit 7386823e6e65bd65d80c60b499b50d81af5b311f

6
platform/broadcom/sonic-platform-modules-cel/debian/control
View File

@ -7,16 +7,16 @@ Standards-Version: 3.9.3
Package: platform-modules-dx010
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-haliburton
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-silverstone
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as led, sfp.

12
platform/broadcom/sonic-platform-modules-dell/debian/control
View File

@ -7,30 +7,30 @@ Standards-Version: 3.9.3
Package: platform-modules-s6000
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-z9100
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-s6100
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-z9264f
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-s5232f
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-s5248f
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

10
platform/broadcom/sonic-platform-modules-delta/debian/control
View File

@ -7,25 +7,25 @@ Standards-Version: 3.9.3
Package: platform-modules-ag9032v1
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-ag9064
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-ag5648
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-et-6248brb
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-ag9032v2a
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as syseeprom, sfp

2
platform/broadcom/sonic-platform-modules-delta/debian/platform-modules-et-6248brb.init
View File

@ -25,7 +25,7 @@ start)
modprobe dni_gpio
modprobe delta_et-6248brb_platform
if [ `uname -a | awk '{print $3}'` = "4.9.0-11-2-amd64" ]; then
if [ `uname -a | awk '{print $3}'` = "4.9.0-14-2-amd64" ]; then
echo "453" > "/sys/class/gpio/export"
echo "454" > "/sys/class/gpio/export"
echo "455" > "/sys/class/gpio/export"

2
platform/broadcom/sonic-platform-modules-delta/et-6248brb/scripts/led_status.sh
View File

@ -7,7 +7,7 @@ FAN2_RPM="/sys/bus/i2c/devices/0-002e/fan2_input"
FAN_TRAY1_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan1_led_ag"
FAN_TRAY2_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan2_led_ag"
if [ `uname -a | awk '{print $3}'` = "4.9.0-11-2-amd64" ]; then
if [ `uname -a | awk '{print $3}'` = "4.9.0-14-2-amd64" ]; then
SYS_LED_G="/sys/class/gpio/gpio453/value"
SYS_LED_R="/sys/class/gpio/gpio454/value"
PWR_LED_G="/sys/class/gpio/gpio455/value"

2
platform/broadcom/sonic-platform-modules-inventec/d6356/utils/inventec_d6356_util.py
View File

@ -141,7 +141,7 @@ def system_install():
status, output = exec_cmd("rmmod lpc_ich ", 1)
#insert extra module
status, output = exec_cmd("insmod /lib/modules/4.9.0-11-2-amd64/kernel/drivers/gpio/gpio-ich.ko gpiobase=0",1)
status, output = exec_cmd("insmod /lib/modules/4.9.0-14-2-amd64/kernel/drivers/gpio/gpio-ich.ko gpiobase=0",1)
#install drivers
for i in range(0,len(drivers)):

12
platform/broadcom/sonic-platform-modules-inventec/debian/control
View File

@ -7,30 +7,30 @@ Standards-Version: 3.9.3
Package: platform-modules-d7032q28b
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led
Package: platform-modules-d7054q28b
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led
Package: platform-modules-d6254qs
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led
Package: platform-modules-d6556
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led
Package: platform-modules-d6356
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led
Package: platform-modules-d7264q28b
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led

4
platform/centec/sonic-platform-modules-e582/debian/control
View File

@ -7,11 +7,11 @@ Standards-Version: 3.9.3
Package: platform-modules-e582-48x2q4z
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-e582-48x6q
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

2
platform/innovium/sonic-platform-modules-cel/debian/control
View File

@ -7,5 +7,5 @@ Standards-Version: 3.9.3
Package: platform-modules-midstone-200i
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices

4
platform/innovium/sonic-platform-modules-delta/debian/control
View File

@ -7,10 +7,10 @@ Standards-Version: 3.9.3
Package: platform-modules-et-c032if
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-evs-a-32q56
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

2
platform/nephos/nephos-modules.mk
View File

@ -9,7 +9,7 @@ SDK_FROM_LOCAL = n
endif
SDK_VERSION = 3.0.0
LINUX_VER = 4.9.0-11-2
LINUX_VER = 4.9.0-14-2
SDK_COMMIT_ID = 529202
ifeq ($(SAI_FROM_LOCAL), y)

2
platform/nephos/nephos-modules/debian/control
View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: nephos-modules
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for nephos asic

2
platform/nephos/nephos-modules/modules/init.d/nps-modules-4.9-amd64
View File

@ -45,7 +45,7 @@ force-reload|restart)
;;
*)
echo "Usage: /etc/init.d/nps-modules-4.9.0-11-2-amd64.init {start|stop}"
echo "Usage: /etc/init.d/nps-modules-4.9.0-14-2-amd64.init {start|stop}"
exit 1
;;
esac

2
platform/nephos/sonic-platform-modules-accton/debian/control
View File

@ -7,5 +7,5 @@ Standards-Version: 3.9.3
Package: sonic-platform-accton-as7116-54x
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

6
platform/nephos/sonic-platform-modules-cig/debian/control
View File

@ -7,15 +7,15 @@ Standards-Version: 3.9.3
Package: sonic-platform-cig-cs6436-56p
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: sonic-platform-cig-cs6436-54p
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
Package: sonic-platform-cig-cs5435-54p
Architecture: amd64
Depends: linux-image-4.9.0-11-2-amd64
Depends: linux-image-4.9.0-14-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

6
rules/linux-kernel.mk
View File

@ -1,9 +1,9 @@
# linux kernel package
KVERSION_SHORT = 4.9.0-11-2
KVERSION_SHORT = 4.9.0-14-2
KVERSION = $(KVERSION_SHORT)-$(CONFIGURED_ARCH)
KERNEL_VERSION = 4.9.189
KERNEL_SUBVERSION = 3+deb9u2
KERNEL_VERSION = 4.9.246
KERNEL_SUBVERSION = 2
ifeq ($(CONFIGURED_ARCH), armhf)
# Override kernel version for ARMHF as it uses arm MP (multi-platform) for short version
KVERSION = $(KVERSION_SHORT)-armmp

2
src/sonic-linux-kernel

@ -1 +1 @@
Subproject commit 2f173b45da29f3643212d6c9111db321797453ec
Subproject commit 335fec8528bbf3fad9451554de16922f8c59dda4