summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShiji Yang2025-05-10 09:19:18 +0000
committerHauke Mehrtens2025-10-18 12:21:01 +0000
commitaf8fc7ceabfe204a03386acf820b76e35d0bfee6 (patch)
tree847896c17c7d6bc07a60eb82996b773c81f41314
parent7d9670039d0236c1604c19e3f7e40c50f34a6ddf (diff)
downloadopenwrt-af8fc7ceabfe204a03386acf820b76e35d0bfee6.tar.gz
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 <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/18744 Signed-off-by: Robert Marko <robimarko@gmail.com> (cherry picked from commit 491764f0f07dc601e1671940d3d3ae41801ae736) Signed-off-by: Nora Matthias Schiffer <neocturne@universe-factory.net> Link: https://github.com/openwrt/openwrt/pull/20440 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--package/kernel/lantiq/ltq-atm/patches/100-ltq_atm-fix-compillation-warning.patch12
-rw-r--r--package/kernel/lantiq/ltq-atm/src/ltq_atm.c3
2 files changed, 2 insertions, 13 deletions
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;