Merge "CVE-2019-15916: kernel: memory leak in register_queue_kobjects" into r/stx.3.0

This commit is contained in:
Zuul 2020-07-09 15:23:00 +00:00 committed by Gerrit Code Review
commit c66d9a1354
5 changed files with 9 additions and 9 deletions

View File

@ -296,7 +296,7 @@ for line in $(cat $tarball_file); do
tar czvf $tarball_name $directory_name
rm -rf $directory_name
popd > /dev/null # pushd $directory_name
elif [[ "$tarball_name" = 'MLNX_OFED_SRC-4.5-1.0.1.0.tgz' ]]; then
elif [[ "$tarball_name" = 'MLNX_OFED_SRC-5.0-2.1.8.0.tgz' ]]; then
srpm_path="${directory_name}/SRPMS/"
download_package "$tarball_name" "$tarball_url"
if [ $? -ne 0 ]; then
@ -306,9 +306,9 @@ for line in $(cat $tarball_file); do
fi
tar -xf "$tarball_name"
cp "${srpm_path}/mlnx-ofa_kernel-4.5-OFED.4.5.1.0.1.1.gb4fdfac.src.rpm" .
cp "${srpm_path}/rdma-core-45mlnx1-1.45101.src.rpm" .
cp "${srpm_path}/libibverbs-41mlnx1-OFED.4.5.0.1.0.45101.src.rpm" .
cp "${srpm_path}/mlnx-ofa_kernel-5.0-OFED.5.0.2.1.8.1.g5f67178.src.rpm" .
cp "${srpm_path}/rdma-core-50mlnx1-1.50218.src.rpm" .
cp "${srpm_path}/libibverbs-41mlnx1-OFED.5.0.0.0.9.50218.src.rpm" .
# Don't delete the original MLNX_OFED_LINUX tarball.
# We don't use it, but it will prevent re-downloading this file.
# rm -f "$tarball_name"

View File

@ -525,8 +525,8 @@ kbd-1.15.5-15.el7.x86_64.rpm
kbd-legacy-1.15.5-15.el7.noarch.rpm
kbd-misc-1.15.5-15.el7.noarch.rpm
kde-filesystem-4-47.el7.x86_64.rpm
kernel-3.10.0-1062.1.2.el7.src.rpm
kernel-headers-3.10.0-1062.1.2.el7.x86_64.rpm
kernel-3.10.0-1127.13.1.el7.src.rpm
kernel-headers-3.10.0-1127.13.1.el7.x86_64.rpm
keyutils-1.5.8-3.el7.x86_64.rpm
keyutils-libs-1.5.8-3.el7.x86_64.rpm
keyutils-libs-devel-1.5.8-3.el7.x86_64.rpm

View File

@ -42,7 +42,7 @@ iprutils-2.4.16.1-1.el7.x86_64.rpm
java-1.8.0-openjdk-1.8.0.191.b12-1.el7_6.x86_64.rpm
java-1.8.0-openjdk-devel-1.8.0.191.b12-1.el7_6.x86_64.rpm
java-1.8.0-openjdk-headless-1.8.0.191.b12-1.el7_6.x86_64.rpm
kernel-rt-3.10.0-1062.1.2.rt56.1025.el7.src.rpm
kernel-rt-3.10.0-1127.13.1.rt56.1110.el7.src.rpm
kexec-tools-2.0.15-21.el7.x86_64.rpm
libblkid-2.23.2-59.el7.x86_64.rpm
libcom_err-1.42.9-13.el7.x86_64.rpm

View File

@ -45,7 +45,7 @@ libtpms-0.6.0-4f0d59d.tar.gz#libtpms-0.6.0#https://github.com/stefanberger/libtp
lldpd-0.9.0.tar.gz#lldpd-0.9.0#https://media.luffy.cx/files/lldpd/lldpd-0.9.0.tar.gz#http##
lua-1fce39c6397056db645718b8f5821571d97869a4.tar.gz#lua#https://api.github.com/repos/ceph/lua/tarball/1fce39c6397056db645718b8f5821571d97869a4#https##
!mariadb-10.1.28.tar.gz#mariadb-10.1.28#https://github.com/MariaDB/server/archive/mariadb-10.1.28.tar.gz#http_script##post-dl-script/mariadb.sh
!MLNX_OFED_SRC-4.5-1.0.1.0.tgz#MLNX_OFED_SRC-4.5-1.0.1.0#http://content.mellanox.com/ofed/MLNX_OFED-4.5-1.0.1.0/MLNX_OFED_SRC-4.5-1.0.1.0.tgz#http_script##post-dl-script/MLNX_OFEDqat1.7.sh
!MLNX_OFED_SRC-5.0-2.1.8.0.tgz#MLNX_OFED_SRC-5.0-2.1.8.0#http://content.mellanox.com/ofed/MLNX_OFED-5.0-2.1.8.0/MLNX_OFED_SRC-5.0-2.1.8.0.tgz#http_script##unused
opae-intel-fpga-driver-1.3.0-2.tar.gz#opae-intel-fpga-driver-1.3.0-2#https://github.com/OPAE/opae-sdk/releases/download/1.3.0-2/opae-intel-fpga-driver-1.3.0-2.tar.gz#http##
openstack-helm-82c72367c85ca94270f702661c7b984899c1ae38.tar.gz#openstack-helm#https://github.com/openstack/openstack-helm/archive/82c72367c85ca94270f702661c7b984899c1ae38.tar.gz#http##
openstack-helm-infra-c9d6676bf9a5aceb311dc31dadd07cba6a3d6392.tar.gz#openstack-helm-infra#https://github.com/openstack/openstack-helm-infra/archive/c9d6676bf9a5aceb311dc31dadd07cba6a3d6392.tar.gz#http##

View File

@ -22,7 +22,7 @@ fi
mirror_dir=$1
tarball_lst=${MY_REPO_ROOT_DIR}/stx-tools/centos-mirror-tools/tarball-dl.lst
downloads_dir=${MY_REPO}/stx/downloads
extra_downloads="mlnx-ofa_kernel-4.5-OFED.4.5.1.0.1.1.gb4fdfac.src.rpm libibverbs-41mlnx1-OFED.4.5.0.1.0.45101.src.rpm rdma-core-45mlnx1-1.45101.src.rpm"
extra_downloads="mlnx-ofa_kernel-5.0-OFED.5.0.2.1.8.1.g5f67178.src.rpm libibverbs-41mlnx1-OFED.5.0.0.0.9.50218.src.rpm rdma-core-50mlnx1-1.50218.src.rpm"
mkdir -p ${MY_REPO}/stx/downloads