From 5ad4f9be0fc0a6af21787f3312381b5bfa7a430c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 16 Apr 2024 05:23:21 +0200 Subject: Merging debian version 6.1.85-1. Signed-off-by: Daniel Baumann --- ...sr9800-Add-check-for-usbnet_get_endpoints.patch | 39 ---------------------- 1 file changed, 39 deletions(-) delete mode 100644 debian/patches/bugfix/all/sr9800-Add-check-for-usbnet_get_endpoints.patch (limited to 'debian/patches/bugfix/all/sr9800-Add-check-for-usbnet_get_endpoints.patch') diff --git a/debian/patches/bugfix/all/sr9800-Add-check-for-usbnet_get_endpoints.patch b/debian/patches/bugfix/all/sr9800-Add-check-for-usbnet_get_endpoints.patch deleted file mode 100644 index ac7fb2e3e..000000000 --- a/debian/patches/bugfix/all/sr9800-Add-check-for-usbnet_get_endpoints.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Chen Ni -Date: Tue, 5 Mar 2024 07:59:27 +0000 -Subject: sr9800: Add check for usbnet_get_endpoints -Origin: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit?id=9c402819620a842cbfe39359a3ddfaac9adc8384 -Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2024-26651 - -[ Upstream commit 07161b2416f740a2cb87faa5566873f401440a61 ] - -Add check for usbnet_get_endpoints() and return the error if it fails -in order to transfer the error. - -Signed-off-by: Chen Ni -Reviewed-by: Simon Horman -Fixes: 19a38d8e0aa3 ("USB2NET : SR9800 : One chip USB2.0 USB2NET SR9800 Device Driver Support") -Link: https://lore.kernel.org/r/20240305075927.261284-1-nichen@iscas.ac.cn -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/usb/sr9800.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c -index f5e19f3ef6cd..4de514482183 100644 ---- a/drivers/net/usb/sr9800.c -+++ b/drivers/net/usb/sr9800.c -@@ -737,7 +737,9 @@ static int sr9800_bind(struct usbnet *dev, struct usb_interface *intf) - - data->eeprom_len = SR9800_EEPROM_LEN; - -- usbnet_get_endpoints(dev, intf); -+ ret = usbnet_get_endpoints(dev, intf); -+ if (ret) -+ goto out; - - /* LED Setting Rule : - * AABB:CCDD --- -2.43.0 - -- cgit v1.2.3