Commit Graph

4877 Commits (2021.1.070)
 

Author SHA1 Message Date
pedro b27e2e151e Merge branch 'arm-master' into arm-sdk7 5 years ago
pedro 4fb3699f25 busybox: update to 1.31.1 5 years ago
pedro 2aeff61a7c Merge branch 'arm-master' into arm-sdk7 5 years ago
pedro 93c885c50e busybox: update to 1.29.3 5 years ago
pedro d3f12ee6ee Merge branch 'arm-master' into arm-sdk7 5 years ago
M_ars e1a6b08d3f shared: led clean-up and use defines for GPIO_XY
Note: for sdk7, prepare for merge
5 years ago
M_ars e5f02f8bde shared: led.c: - improve function do_led_nongpio() and some cosmetic
Note: for sdk7, prepare for merge
5 years ago
M_ars fc75e45a58 SDK6: update NAS / Network Authentication Server
Note: tested with arm, all ok
5 years ago
M_ars 82b1281881 LEDs: repair wireless LED and bridge LED (was not working anymore for mips branch)
Note: only cosmetic for arm branch (no change, sync with mips branch)
5 years ago
M_ars 53cddc5c7d www: Makefile: small addition for commit vsftpd: add native support for basic ftp_tls using router httpd cert/key (3cef32e9fd)
Note: cosmetic for arm because always usb support so far (--> stay as close as possible to mips branch)
5 years ago
M_ars 106a84cdbc Add Asus RT-N66U C1 support (almost the same like RT-AC66U B1)
Note: add support based on asus src and http://en.techinfodepot.shoutwiki.com/wiki/ASUS_RT-N66U_C1

- same router case like RT-AC66U B1 (buttons, leds, etc.)
- 2x Broadcom BCM4360 (eth1/eth2)
- router only sold in some countrys
5 years ago
M_ars 788f09764b defaults.c : disable IP Traffic (cstats) Monitoring feature by default and save cpu workload
Note: tomato user can enable it at admin-iptraffic.asp if needed.
In additon disabling cstats avoids the waring/note at basic-network.asp that netmask should have at least 22 bits (255.255.252.0).
(see 5e56835d07)

see arm issue 72
5 years ago
M_ars bde84c8df8 router: rc: firewall.c: raise a little allowed hit count in BF protection for remote GUI access (part 2 for IPv6) 5 years ago
M_ars 76e33d86a3 firewall: allow incoming IPv6 from br0 to br3 (and align also to IPv4)
Note: see arm issue 75
5 years ago
M_ars 048586b830 shared: led clean-up and use defines for GPIO_XY 5 years ago
M_ars 968a115645 shared: led.c: - improve function do_led_nongpio() and some cosmetic 5 years ago
M_ars 94e47c8948 SDK6: update ctf (part 2) (for single and dual-core)
tested with R7000 and RT-N18U, working correct
5 years ago
pedro 86e0f8b9db busybox: update to 1.27.2 5 years ago
pedro 81bb0ca432 Merge branch 'arm-master' into arm-sdk7 5 years ago
pedro 1b6bb3eaae patches: getdns: name patches properly 5 years ago
pedro dd28d62f20 getdns: listeners reply returned wireformat (issue #430)
So that proxies based on `getdns_set_listen_addresses()` reply with compression from the original response.

Fix from upstream: bda845ce43
5 years ago
pedro abfd87934e GUI: Advanced: Firewall: simplify the part with WAN behavior for ping and traceroute 5 years ago
pedro bb1ce00109 iptables: update to 1.8.6
- cosmetic in patch
5 years ago
pedro 3ed0f17f6e xl2tpd: update to 1.3.16 5 years ago
pedro bebd606625 Merge branch 'arm-master' into arm-sdk7 5 years ago
pedro 74525823d2 GUI: Admin: Debugging: add possibility to enable segfault logging to syslog 5 years ago
pedro 82d7a9aa78 Merge branch 'arm-master' into arm-sdk7 5 years ago
pedro f1472e119a rc: qos.c: code optimization and clean-up. One version for ARM and MIPS branch.
- in PRs please use #ifdef TCONFIG_BCMARM/#ifndef TCONFIG_BCMARM/etc to distinguish different branches
5 years ago
snowman 5586444903 Merged in arm-master (pull request #35)
Add RT-AC67U support
5 years ago
M_ars 27f8f3cf5f pppd: fix/correction for commit IPv6: split IPv6 / IPv4 up and down logic (see d365748b8f)
fix for: PPTP Server and Client not working anymore

Note: V2 (with adjusted patch)
5 years ago
pedro 2eec459d8a kernel: net_sched: fix datalen for ematch
syzbot reported an out-of-bound access in em_nbyte. As initially
analyzed by Eric, this is because em_nbyte sets its own em->datalen
in em_nbyte_change() other than the one specified by user, but this
value gets overwritten later by its caller tcf_em_validate().
We should leave em->datalen untouched to respect their choices.

I audit all the in-tree ematch users, all of those implement
->change() set em->datalen, so we can just avoid setting it twice
in this case.

Reported-and-tested-by: syzbot+5af9a90dad568aa9f611@syzkaller.appspotmail.com
Reported-by: syzbot+2f07903a5b05e7f36410@syzkaller.appspotmail.com
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    [bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings's avatarBen Hutchings <ben@decadent.org.uk>

Fix from upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=61678d28d4a45ef376f5d02a839cc37509ae9281
5 years ago
pedro 41202425e7 kernel: netfilter: ebtables: compat: reject all padding in matches/watchers
syzbot reported following splat:

BUG: KASAN: vmalloc-out-of-bounds in size_entry_mwt net/bridge/netfilter/ebtables.c:2063 [inline]
BUG: KASAN: vmalloc-out-of-bounds in compat_copy_entries+0x128b/0x1380 net/bridge/netfilter/ebtables.c:2155
Read of size 4 at addr ffffc900004461f4 by task syz-executor267/7937

Reported-by: syzbot+f68108fed972453a0ad4@syzkaller.appspotmail.com
Fixes: 81e675c227ec ("netfilter: ebtables: add CONFIG_COMPAT support")

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Ben Hutchings's avatarBen Hutchings <ben@decadent.org.uk>

Fix from upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e608f631f0ba5f1fc5ee2e260a3a35d13107cbfe
5 years ago
pedro a57380832a kernel: netfilter: ebtables: fix a memory leak bug in compat
In compat_do_replace(), a temporary buffer is allocated through vmalloc()
to hold entries copied from the user space. The buffer address is firstly
saved to 'newinfo->entries', and later on assigned to 'entries_tmp'. Then
the entries in this temporary buffer is copied to the internal kernel
structure through compat_copy_entries(). If this copy process fails,
compat_do_replace() should be terminated. However, the allocated temporary
buffer is not freed on this path, leading to a memory leak.

To fix the bug, free the buffer before returning from compat_do_replace().

Signed-off-by: Wenwen Wang's avatarWenwen Wang <wenwen@cs.uga.edu>
Reviewed-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>

Fix from upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=15a78ba1844a8e052c1226f930133de4cef4e7ad
5 years ago
pedro 02f7a49f72 kernel: netfilter: ebtables: convert BUG_ONs to WARN_ONs
All of these conditions are not fatal and should have
been WARN_ONs from the get-go.

Convert them to WARN_ONs and bail out.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Ben Hutchings's avatarBen Hutchings <ben@decadent.org.uk>

Fix from upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fc6a5d0601c5ac1d02f283a46f60b87b2033e5ca
5 years ago
pedro 4fbb37dcc5 kernel: net_sched: fix datalen for ematch
syzbot reported an out-of-bound access in em_nbyte. As initially
analyzed by Eric, this is because em_nbyte sets its own em->datalen
in em_nbyte_change() other than the one specified by user, but this
value gets overwritten later by its caller tcf_em_validate().
We should leave em->datalen untouched to respect their choices.

I audit all the in-tree ematch users, all of those implement
->change() set em->datalen, so we can just avoid setting it twice
in this case.

Reported-and-tested-by: syzbot+5af9a90dad568aa9f611@syzkaller.appspotmail.com
Reported-by: syzbot+2f07903a5b05e7f36410@syzkaller.appspotmail.com
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    [bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings's avatarBen Hutchings <ben@decadent.org.uk>

Fix from upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=61678d28d4a45ef376f5d02a839cc37509ae9281
5 years ago
pedro cee7c9f02b kernel: netfilter: ebtables: compat: reject all padding in matches/watchers
syzbot reported following splat:

BUG: KASAN: vmalloc-out-of-bounds in size_entry_mwt net/bridge/netfilter/ebtables.c:2063 [inline]
BUG: KASAN: vmalloc-out-of-bounds in compat_copy_entries+0x128b/0x1380 net/bridge/netfilter/ebtables.c:2155
Read of size 4 at addr ffffc900004461f4 by task syz-executor267/7937

Reported-by: syzbot+f68108fed972453a0ad4@syzkaller.appspotmail.com
Fixes: 81e675c227ec ("netfilter: ebtables: add CONFIG_COMPAT support")

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Ben Hutchings's avatarBen Hutchings <ben@decadent.org.uk>

Fix from upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e608f631f0ba5f1fc5ee2e260a3a35d13107cbfe
5 years ago
pedro 3c4b85f02d kernel: netfilter: ebtables: fix a memory leak bug in compat
In compat_do_replace(), a temporary buffer is allocated through vmalloc()
to hold entries copied from the user space. The buffer address is firstly
saved to 'newinfo->entries', and later on assigned to 'entries_tmp'. Then
the entries in this temporary buffer is copied to the internal kernel
structure through compat_copy_entries(). If this copy process fails,
compat_do_replace() should be terminated. However, the allocated temporary
buffer is not freed on this path, leading to a memory leak.

To fix the bug, free the buffer before returning from compat_do_replace().

Signed-off-by: Wenwen Wang's avatarWenwen Wang <wenwen@cs.uga.edu>
Reviewed-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>

Fix from upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=15a78ba1844a8e052c1226f930133de4cef4e7ad
5 years ago
pedro 92b41c0952 kernel: netfilter: ebtables: convert BUG_ONs to WARN_ONs
All of these conditions are not fatal and should have
been WARN_ONs from the get-go.

Convert them to WARN_ONs and bail out.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Ben Hutchings's avatarBen Hutchings <ben@decadent.org.uk>

Fix from upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fc6a5d0601c5ac1d02f283a46f60b87b2033e5ca
5 years ago
snowman a67c11e1f3 Merged pedro311/freshtomato-arm into arm-master 5 years ago
snowman58 f0797aec31 Correct AC67U to align with AC66U_B1 small case style 5 years ago
pedro 58c1140b23 Merge branch 'arm-master' into arm-sdk7 5 years ago
pedro c50a2ee776 build: harmonize BW Limiter filenames, service name, variables names, etc., also in NVRAM; it was a real mess...
Note: those using BW Limiter must either manually rename the variables in NVRAM or enter the values from scratch
5 years ago
pedro 4477c59998 GUI: tinc: properly format the display of information on the Status page; fixes #71 5 years ago
pedro 14b785edea kernel sdk7: QoS: fix definitely ingress system
- mirred sched needed patch
5 years ago
Stefan Wrobel e49ba8e82b Merged in Stefan-Wrobel/motd-only-display-wireless-info-if-that--1604424736884 (pull request #36)
MOTD: only display Wireless info if that radio is enabled
5 years ago
M_ars 7ab0dadf70 kernel SDK6: netfilter: nf_conntrack_core.c - small update and add one more check
Note: align/sync with asus src
5 years ago
pedro c0710b5940 kernel sdk7: QoS: fix (partially) ingress system
- two modules needed for operation were not built
- further investigation is needed as all incoming traffic only goes to the default class, but at least enabling/disabling QoS returns no errors and a graph of incoming bandwidth distribution appears
5 years ago
Stefan Wrobel 5f9e1f8832 MOTD: only display Wireless info if that radio is enabled 5 years ago
pedro 723c989c83 libcurl: update CA certificate bundle as of 2020-10-14 5 years ago
pedro 07314fde25 Merge branch 'arm-master' into arm-sdk7 5 years ago