Skip to content

Fix packet length validation for large extensions #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vitarb wants to merge 1 commit into
base: unstable
Choose a base branch
from
Open

Fix packet length validation for large extensions #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cluster_legacy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3196,7 +3196,7 @@ int clusterIsValidPacket(clusterLink *link) {
if (hdr->mflags[0] & CLUSTERMSG_FLAG0_EXT_DATA) {
clusterMsgPingExt *ext = getInitialPingExt(hdr, count);
while (extensions--) {
uint16_t extlen = getPingExtLength(ext);
uint32_t extlen = getPingExtLength(ext);
if (extlen % 8 != 0) {
serverLog(LL_WARNING, "Received a %s packet without proper padding (%d bytes)",
clusterGetMessageTypeString(type), (int)extlen);
Expand Down
34 changes: 34 additions & 0 deletions tests/unit/cluster/long-ping-ext.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Test for handling large ping extensions (>64k)

start_cluster 1 0 {tags {external:skip cluster}} {
proc build_large_ping {size} {
set padded [expr {(($size + 1 + 7)/8)*8}]
set ext_total [expr {$padded + 8}]
set totlen [expr {2256 + $ext_total}]
set hdr [binary format {A4 I S S S S W W W A40 A2048 A40 A46 S A30 S S S c c c c} \
RCmb $totlen 1 0 0 0 0 0 0 \
[string repeat A 40] \
[string repeat \0 2048] \
[string repeat \0 40] \
[string repeat \0 46] \
1 [string repeat \0 30] 0 0 0 0 4 0 0]
set payload [string repeat A $size]
append payload \x00
append payload [string repeat \x00 [expr {$padded - [string length $payload]}]]
set ext [binary format {I S S a*} $ext_total 0 0 $payload]
return "$hdr$ext"
}

test "Ping extension larger than 64k is accepted" {
set host [srv 0 host]
set cport [expr {[srv 0 port] + 10000}]
set sock [socket $host $cport]
fconfigure $sock -translation binary -blocking 1
set logline [count_log_lines 0]
puts -nonewline $sock [build_large_ping 70000]
flush $sock
close $sock
after 1000
verify_no_log_message 0 "*Received invalid PING packet*" $logline
}
}