From af8fc7ceabfe204a03386acf820b76e35d0bfee6 Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Sat, 10 May 2025 17:19:18 +0800 Subject: [PATCH] ltq-atm: apply local patch to the source files This package is maintained by the OpenWrt local repository. There is no need to modify it with the patch file. Just apply all patches to the source files. Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/18744 Signed-off-by: Robert Marko (cherry picked from commit 491764f0f07dc601e1671940d3d3ae41801ae736) Signed-off-by: Nora Matthias Schiffer Link: https://github.com/openwrt/openwrt/pull/20440 Signed-off-by: Hauke Mehrtens --- .../100-ltq_atm-fix-compillation-warning.patch | 12 ------------ package/kernel/lantiq/ltq-atm/src/ltq_atm.c | 3 ++- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 package/kernel/lantiq/ltq-atm/patches/100-ltq_atm-fix-compillation-warning.patch diff --git a/package/kernel/lantiq/ltq-atm/patches/100-ltq_atm-fix-compillation-warning.patch b/package/kernel/lantiq/ltq-atm/patches/100-ltq_atm-fix-compillation-warning.patch deleted file mode 100644 index c74cfcb6b4..0000000000 --- a/package/kernel/lantiq/ltq-atm/patches/100-ltq_atm-fix-compillation-warning.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/ltq_atm.c -+++ b/ltq_atm.c -@@ -338,7 +338,8 @@ static int ppe_ioctl(struct atm_dev *dev - break; - - case PPE_ATM_MIB_VCC: /* VCC related MIB */ -- copy_from_user(&mib_vcc, arg, sizeof(mib_vcc)); -+ if (copy_from_user(&mib_vcc, arg, sizeof(mib_vcc))) -+ return -EFAULT; - conn = find_vpivci(mib_vcc.vpi, mib_vcc.vci); - if (conn >= 0) { - mib_vcc.mib_vcc.aal5VccCrcErrors = g_atm_priv_data.conn[conn].aal5_vcc_crc_err; diff --git a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c index 6b1e0321b3..dc2361be75 100644 --- a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c +++ b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c @@ -338,7 +338,8 @@ static int ppe_ioctl(struct atm_dev *dev, unsigned int cmd, void *arg) break; case PPE_ATM_MIB_VCC: /* VCC related MIB */ - copy_from_user(&mib_vcc, arg, sizeof(mib_vcc)); + if (copy_from_user(&mib_vcc, arg, sizeof(mib_vcc))) + return -EFAULT; conn = find_vpivci(mib_vcc.vpi, mib_vcc.vci); if (conn >= 0) { mib_vcc.mib_vcc.aal5VccCrcErrors = g_atm_priv_data.conn[conn].aal5_vcc_crc_err; -- 2.30.2