Skip to content

Commit

Permalink
Merge branch 'master' into build_tag_override
Browse files Browse the repository at this point in the history
  • Loading branch information
jessepeq23 authored Jul 18, 2024
2 parents bf478f8 + 1f672e1 commit 1f5477f
Show file tree
Hide file tree
Showing 17 changed files with 795 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ RUN apt-get update \
zlib1g-dev \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get clean


# https://github.com/docker-library/openjdk/issues/261 https://github.com/docker-library/openjdk/pull/263/files
RUN keytool -importkeystore -srckeystore /etc/ssl/certs/java/cacerts -destkeystore /etc/ssl/certs/java/cacerts.jks -deststoretype JKS -srcstorepass changeit -deststorepass changeit -noprompt; \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ RUN pip install --no-cache-dir \
numpy>=1.21.5 \
"sagemaker-huggingface-inference-toolkit<3"


RUN HOME_DIR=/root \
&& curl -o ${HOME_DIR}/oss_compliance.zip https://aws-dlinfra-utilities.s3.amazonaws.com/oss_compliance.zip \
&& unzip ${HOME_DIR}/oss_compliance.zip -d ${HOME_DIR}/ \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ RUN HOME_DIR=/root \
&& rm -rf ${HOME_DIR}/oss_compliance* \
# conda leaves an empty /root/.cache/conda/notices.cache file which is not removed by conda clean -ya
&& rm -rf ${HOME_DIR}/.cache/conda


EXPOSE 8080 8081
ENTRYPOINT ["python", "/usr/local/bin/dockerd-entrypoint.py"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN pip install --no-cache-dir \
RUN apt-get update \
# TODO: Remove upgrade statements once packages are updated in base image
&& apt-get -y upgrade --only-upgrade systemd openssl cryptsetup \
&& apt install -y git-lfs \
&& apt install -y git git-lfs \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RUN pip install --no-cache-dir \
RUN apt-get update \
# TODO: Remove upgrade statements once packages are updated in base image
&& apt-get -y upgrade --only-upgrade systemd openssl cryptsetup \
&& apt install -y git-lfs \
&& apt install -y git git-lfs \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
{
"linux": [
{
"description": " In the Linux kernel, the following vulnerability has been resolved: net: ip_tunnel: make sure to pull inner header in ip_tunnel_rcv() Apply the same fix than ones found in : 8d975c15c0cd (\"ip6_tunnel: make sure to pull inner header in __ip6_tnl_rcv()\") 1ca1ba465e55 (\"geneve: make sure to pull inner header in geneve_rx()\") We have to save skb->network_header in a temporary variable in order to be able to recompute the network_header pointer after a pskb_inet_may_pull() call. pskb_inet_may_pull() makes sure the needed headers are in skb->head. syzbot reported: BUG: KMSAN: uninit-value in __INET_ECN_decapsulate include/net/inet_ecn.h:253 [inline] BUG: KMSAN: uninit-value in INET_ECN_decapsulate include/net/inet_ecn.h:275 [inline] BUG: KMSAN: uninit-value in IP_ECN_decapsulate include/net/inet_ecn.h:302 [inline] BUG: KMSAN: uninit-value in ip_tunnel_rcv+0xed9/0x2ed0 net/ipv4/ip_tunnel.c:409 __INET_ECN_decapsulate include/net/inet_ecn.h:253 [inline] INET_ECN_decapsulate include/net/inet_ecn.h:275 [inline] IP_ECN_",
"vulnerability_id": "CVE-2024-26882",
"name": "CVE-2024-26882",
"package_name": "linux",
"package_details": {
"file_path": null,
"name": "linux",
"package_manager": "OS",
"version": "5.4.0",
"release": "187.207"
},
"remediation": {
"recommendation": {
"text": "None Provided"
}
},
"cvss_v3_score": 7.8,
"cvss_v30_score": 0.0,
"cvss_v31_score": 7.8,
"cvss_v2_score": 0.0,
"cvss_v3_severity": "HIGH",
"source_url": "https://people.canonical.com/~ubuntu-security/cve/2024/CVE-2024-26882.html",
"source": "UBUNTU_CVE",
"severity": "HIGH",
"status": "ACTIVE",
"title": "CVE-2024-26882 - linux",
"reason_to_ignore": "Package and its binaries cannot be upgraded further. Packages: linux-libc-dev have been upgraded."
},
{
"description": " In the Linux kernel, the following vulnerability has been resolved: bpf: Fix stackmap overflow check on 32-bit arches The stackmap code relies on roundup_pow_of_two() to compute the number of hash buckets, and contains an overflow check by checking if the resulting value is 0. However, on 32-bit arches, the roundup code itself can overflow by doing a 32-bit left-shift of an unsigned long value, which is undefined behaviour, so it is not guaranteed to truncate neatly. This was triggered by syzbot on the DEVMAP_HASH type, which contains the same check, copied from the hashtab code. The commit in the fixes tag actually attempted to fix this, but the fix did not account for the UB, so the fix only works on CPUs where an overflow does result in a neat truncation to zero, which is not guaranteed. Checking the value before rounding does not have this problem.",
"vulnerability_id": "CVE-2024-26883",
"name": "CVE-2024-26883",
"package_name": "linux",
"package_details": {
"file_path": null,
"name": "linux",
"package_manager": "OS",
"version": "5.4.0",
"release": "187.207"
},
"remediation": {
"recommendation": {
"text": "None Provided"
}
},
"cvss_v3_score": 7.8,
"cvss_v30_score": 0.0,
"cvss_v31_score": 7.8,
"cvss_v2_score": 0.0,
"cvss_v3_severity": "HIGH",
"source_url": "https://people.canonical.com/~ubuntu-security/cve/2024/CVE-2024-26883.html",
"source": "UBUNTU_CVE",
"severity": "HIGH",
"status": "ACTIVE",
"title": "CVE-2024-26883 - linux",
"reason_to_ignore": "Package and its binaries cannot be upgraded further. Packages: linux-libc-dev have been upgraded."
},
{
"description": " In the Linux kernel, the following vulnerability has been resolved: aoe: fix the potential use-after-free problem in aoecmd_cfg_pkts This patch is against CVE-2023-6270. The description of cve is: A flaw was found in the ATA over Ethernet (AoE) driver in the Linux kernel. The aoecmd_cfg_pkts() function improperly updates the refcnt on `struct net_device`, and a use-after-free can be triggered by racing between the free on the struct and the access through the `skbtxq` global queue. This could lead to a denial of service condition or potential code execution. In aoecmd_cfg_pkts(), it always calls dev_put(ifp) when skb initial code is finished. But the net_device ifp will still be used in later tx()->dev_queue_xmit() in kthread. Which means that the dev_put(ifp) should NOT be called in the success path of skb initial code in aoecmd_cfg_pkts(). Otherwise tx() may run into use-after-free because the net_device is freed. This patch removed the dev_put(ifp) in the success path in aoecmd_cfg_pkts(), and added dev_p",
"vulnerability_id": "CVE-2024-26898",
"name": "CVE-2024-26898",
"package_name": "linux",
"package_details": {
"file_path": null,
"name": "linux",
"package_manager": "OS",
"version": "5.4.0",
"release": "187.207"
},
"remediation": {
"recommendation": {
"text": "None Provided"
}
},
"cvss_v3_score": 7.8,
"cvss_v30_score": 0.0,
"cvss_v31_score": 7.8,
"cvss_v2_score": 0.0,
"cvss_v3_severity": "HIGH",
"source_url": "https://people.canonical.com/~ubuntu-security/cve/2024/CVE-2024-26898.html",
"source": "UBUNTU_CVE",
"severity": "HIGH",
"status": "ACTIVE",
"title": "CVE-2024-26898 - linux",
"reason_to_ignore": "Package and its binaries cannot be upgraded further. Packages: linux-libc-dev have been upgraded."
},
{
"description": " In the Linux kernel, the following vulnerability has been resolved: bpf: Fix hashtab overflow check on 32-bit arches The hashtab code relies on roundup_pow_of_two() to compute the number of hash buckets, and contains an overflow check by checking if the resulting value is 0. However, on 32-bit arches, the roundup code itself can overflow by doing a 32-bit left-shift of an unsigned long value, which is undefined behaviour, so it is not guaranteed to truncate neatly. This was triggered by syzbot on the DEVMAP_HASH type, which contains the same check, copied from the hashtab code. So apply the same fix to hashtab, by moving the overflow check to before the roundup.",
"vulnerability_id": "CVE-2024-26884",
"name": "CVE-2024-26884",
"package_name": "linux",
"package_details": {
"file_path": null,
"name": "linux",
"package_manager": "OS",
"version": "5.4.0",
"release": "187.207"
},
"remediation": {
"recommendation": {
"text": "None Provided"
}
},
"cvss_v3_score": 7.8,
"cvss_v30_score": 0.0,
"cvss_v31_score": 7.8,
"cvss_v2_score": 0.0,
"cvss_v3_severity": "HIGH",
"source_url": "https://people.canonical.com/~ubuntu-security/cve/2024/CVE-2024-26884.html",
"source": "UBUNTU_CVE",
"severity": "HIGH",
"status": "ACTIVE",
"title": "CVE-2024-26884 - linux",
"reason_to_ignore": "Package and its binaries cannot be upgraded further. Packages: linux-libc-dev have been upgraded."
},
{
"description": " In the Linux kernel, the following vulnerability has been resolved: netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get() nft_unregister_expr() can concurrent with __nft_expr_type_get(), and there is not any protection when iterate over nf_tables_expressions list in __nft_expr_type_get(). Therefore, there is potential data-race of nf_tables_expressions list entry. Use list_for_each_entry_rcu() to iterate over nf_tables_expressions list in __nft_expr_type_get(), and use rcu_read_lock() in the caller nft_expr_type_get() to protect the entire type query process.",
"vulnerability_id": "CVE-2024-27020",
"name": "CVE-2024-27020",
"package_name": "linux",
"package_details": {
"file_path": null,
"name": "linux",
"package_manager": "OS",
"version": "5.4.0",
"release": "187.207"
},
"remediation": {
"recommendation": {
"text": "None Provided"
}
},
"cvss_v3_score": 7.0,
"cvss_v30_score": 0.0,
"cvss_v31_score": 7.0,
"cvss_v2_score": 0.0,
"cvss_v3_severity": "HIGH",
"source_url": "https://people.canonical.com/~ubuntu-security/cve/2024/CVE-2024-27020.html",
"source": "UBUNTU_CVE",
"severity": "HIGH",
"status": "ACTIVE",
"title": "CVE-2024-27020 - linux",
"reason_to_ignore": "Package and its binaries cannot be upgraded further. Packages: linux-libc-dev have been upgraded."
},
{
"description": " In the Linux kernel, the following vulnerability has been resolved: USB: core: Fix deadlock in usb_deauthorize_interface() Among the attribute file callback routines in drivers/usb/core/sysfs.c, the interface_authorized_store() function is the only one which acquires a device lock on an ancestor device: It calls usb_deauthorize_interface(), which locks the interface's parent USB device. The will lead to deadlock if another process already owns that lock and tries to remove the interface, whether through a configuration change or because the device has been disconnected. As part of the removal procedure, device_del() waits for all ongoing sysfs attribute callbacks to complete. But usb_deauthorize_interface() can't complete until the device lock has been released, and the lock won't be released until the removal has finished. The mechanism provided by sysfs to prevent this kind of deadlock is to use the sysfs_break_active_protection() function, which tells sysfs not to wait for the attribute callback. Reported",
"vulnerability_id": "CVE-2024-26934",
"name": "CVE-2024-26934",
"package_name": "linux",
"package_details": {
"file_path": null,
"name": "linux",
"package_manager": "OS",
"version": "5.4.0",
"release": "187.207"
},
"remediation": {
"recommendation": {
"text": "None Provided"
}
},
"cvss_v3_score": 7.8,
"cvss_v30_score": 0.0,
"cvss_v31_score": 7.8,
"cvss_v2_score": 0.0,
"cvss_v3_severity": "HIGH",
"source_url": "https://people.canonical.com/~ubuntu-security/cve/2024/CVE-2024-26934.html",
"source": "UBUNTU_CVE",
"severity": "HIGH",
"status": "ACTIVE",
"title": "CVE-2024-26934 - linux",
"reason_to_ignore": "Package and its binaries cannot be upgraded further. Packages: linux-libc-dev have been upgraded."
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#### First image: sha256:7525ac24babb8f2212965e53702abddad038a2a5477ffacb9e56a1f894941779 ####
#### Patch contents for patch-1: sha256:271c12be612ddad6912b2e4d3eee50c7ddb7c62c7a5f880e6e4534da30e5cd0c ####
echo N/A
apt-get update && apt-get install -y --only-upgrade libtiff5
#### Patch contents for patch-2: sha256:967d2081e0f7d44abb56a937e58045a8b050929409a5ab250b3af23843f8339c ####
echo N/A
apt-get update && apt-get install -y --only-upgrade libtiff5
#### Patch contents for patch-3: sha256:55adf274b80afd2c14a46ab97e53555024d4ad424b5e3bf1481ff1c736666250 ####
echo N/A
apt-get update && apt-get install -y --only-upgrade libtiff5 linux-libc-dev
#### Patch contents for patch-4: sha256:4e14f288144e9f4c862be20f2c3d501e3d23d041f11fb8690a09e80c48cff1ec ####
pip install urllib3==1.26.19
apt-get update && apt-get install -y --only-upgrade git-man git libtiff5 linux-libc-dev
#### Patch contents for patch-5: sha256:a6c13375c85ff683e89e2759057bb1900d2407b0172aa8b404e93fef14cbea1c ####
pip install urllib3==1.26.19
apt-get update && apt-get install -y --only-upgrade git-man git libcups2 libtiff5 linux-libc-dev
#### Patch contents for patch-6: sha256:6074840442c0b602b57fe9868222e6f039bda89c89ebcf9ce6255383dadb6378 ####
pip install urllib3==1.26.19
apt-get update && apt-get install -y --only-upgrade git-man git libcups2 libtiff5 linux-libc-dev
#### Patch contents for patch-7: sha256:6f91733c3260b3bcb6e79df61ec7cd15d58d5fd8d659b9574324c819d4b3b623 ####
pip install urllib3==1.26.19
apt-get update && apt-get install -y --only-upgrade git-man git libcups2 libtiff5 linux-libc-dev wget
#### Patch contents for patch-8: sha256:9f18921da568e955c3dc843addd4413cc7fd43bc73f2fcb70a032d503a1bad72 ####
pip install urllib3==1.26.19
apt-get update && apt-get install -y --only-upgrade git-man git libcups2 libtiff5 linux-libc-dev wget
#### Current Patch contents ####
pip install urllib3==1.26.19
apt-get update && apt-get install -y --only-upgrade git-man git libcups2 libtiff5 linux-libc-dev wget
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"70612": "This Jinja2 CVE is disputed and has no fix."
}
"70612": "This Jinja2 CVE is disputed and has no fix.",
"71670": "[Package: torch] Conflicts for: torch",
"71671": "[Package: torch] Conflicts for: torch",
"71672": "[Package: torch] Conflicts for: torch"
}
Loading

0 comments on commit 1f5477f

Please sign in to comment.