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>

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 (file)
index c74cfcb..0000000
--- 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 6b1e0321b3ee179109556be82dfec3cbf983a478..dc2361be75e15c0275afd0b169e20e68ff50b768 100644 (file)
--- 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;