Skip to content

Xr1710g 6.18 integration test sync 20260706 讨论openwrt上游分支一个文件冲突,代码修改方法 - #3

Closed
jjcszxh wants to merge 54 commits into
YYH2913:xr1710g-6.18-integrationfrom
jjcszxh:xr1710g-6.18-integration-test-sync-20260706
Closed

Xr1710g 6.18 integration test sync 20260706 讨论openwrt上游分支一个文件冲突,代码修改方法#3
jjcszxh wants to merge 54 commits into
YYH2913:xr1710g-6.18-integrationfrom
jjcszxh:xr1710g-6.18-integration-test-sync-20260706

Conversation

@jjcszxh

@jjcszxh jjcszxh commented Jul 6, 2026

Copy link
Copy Markdown

讨论同步openwrt上游分支一个文件冲突,代码修改方法
package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/hostapd.uc

YYH2913 and others added 30 commits July 1, 2026 08:56
This reverts commit baecc5f6a568c31ca34923b6280a1a3d13d57b8a.
Keep NL80211 radio data complete across split wiphy dumps and make iwinfo request split dumps when building txpower lists.

This avoids bogus txpower list values on single-wiphy multi-radio devices.
Refresh mt7996 firmware SKU tables on mac80211 power/channel updates and BSS txpower changes so runtime txpower updates take effect.
Enable the mt7996 firmware SKU and backoff txpower controls and upload the firmware table layout used by the driver.
Apply txpower through active interfaces for single-wiphy multi-radio devices and retry after setup for AP paths that finish channel state later.
Port the W1700K hardware compatibility fixes carried by the reference 6.18 branches.

Increase the Airoha NPU mailbox poll timeout for Eagle firmware init commands, and clear USB_PCIE_SEL during EN7581 PCIe XSI clock setup so PCIe lanes are not left in USB shared mode.

Verified with target/linux clean/prepare on the 6.18 Airoha patch queue.
jjcszxh and others added 5 commits July 7, 2026 08:56
Signed-off-by: Lucas <juejingchongsheng@gmail.com>
Signed-off-by: Lucas <juejingchongsheng@gmail.com>
Signed-off-by: Lucas <juejingchongsheng@gmail.com>
Signed-off-by: jjcszxh <1003062992@qq.com>
@YYH2913
YYH2913 force-pushed the xr1710g-6.18-integration branch from f001bcc to 2a845ee Compare July 11, 2026 23:56
@jjcszxh jjcszxh closed this Jul 14, 2026
@jjcszxh
jjcszxh deleted the xr1710g-6.18-integration-test-sync-20260706 branch July 14, 2026 07:30
jjcszxh pushed a commit to jjcszxh/openwrt-XR1710G that referenced this pull request Aug 17, 2026
f6c2fcfa539d client: cap cumulative header count and bytes per request
4f307a2156f3 client: verify chunk data is followed by CRLF before resyncing
628a073fef44 listen: set IP_FREEBIND so binding to a not-yet-present address works
0910904b75a3 client: reject empty chunk size lines in chunked transfer parsing
893fed8577d7 client: use strict chunk size parsing to fix issue YYH2913#3
8867514f51fa client: fix parse_chunksize() return type and stale comment
daa5078b959b client: reject invalid header names to prevent request smuggling
69f9cabd0d7d http: use chartypes table consistently, drop ctype.h
003cd188b8f9 http: further consolidate character classification and header parsing
f682ccabee9e client: parse and discard chunked trailer sections, use enum chunked_state
e76736e5676f ubus: guard params type in uh_ubus_send_request()
42e30caa704e ubus: set d->free unconditionally to fix url_path leak
d6205aad6176 client: move unread-body guard into uh_request_done()
3c48b9e17d20 ubus: release client refcount on successful /ubus/subscribe
d0b89eb7c70b utils: strip trailing whitespace from header field-values
067466662368 file: dereference symlinks when looking up MIME type
c54ba119cf54 lua, ucode: use buffered stdio for script output
60f64bec40c8 tls: add SNI-based redirect support

This closes five published security advisories, three of them rated
high: an unauthenticated header-accumulation memory-exhaustion DoS,
an out-of-bounds write via ubus params type confusion, a url_path
leak, a CL.0 request smuggling desync and a leaked client refcount
that wedges the listener.

Fixes: openwrt/uhttpd#3
Fixes: openwrt/uhttpd#5
Fixes: openwrt/uhttpd#10
Fixes: openwrt/uhttpd#11
Fixes: openwrt/uhttpd#14
Fixes: openwrt/uhttpd#17
Closes: openwrt/uhttpd#19
Link: GHSA-vhx4-3p5q-m59q
Link: GHSA-2mpg-6wp5-435p
Link: GHSA-83vv-qrc6-h3hx
Link: GHSA-c2wg-hcff-hqrm
Link: GHSA-wvgh-cm54-q6f6
Link: openwrt#24680
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment