-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix segfault on client sending malformed CONNACk.
CVE-xxxx-xxxx: If an authenticated client connected with MQTT v5 sent a malformed CONNACK message to the broker a NULL pointer dereference occurred, most likely resulting in a segfault. This will be updated with the CVE number when it is assigned. Affects versions 2.0.0 to 2.0.9 inclusive. Closes #2136. Thanks to Bryan Pearson.
- Loading branch information
Showing
5 changed files
with
62 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
#!/usr/bin/env python3 | ||
|
||
# Test https://github.com/eclipse/mosquitto/issues/2163 | ||
# Does the broker cope with a malformed CONNACK sent to it after a valid CONNECT? | ||
|
||
from mosq_test_helper import * | ||
|
||
def do_test(proto_ver): | ||
rc = 1 | ||
keepalive = 10 | ||
connect_packet = mosq_test.gen_connect("connect-connack-2163", keepalive=keepalive, proto_ver=proto_ver) | ||
connack_packet = mosq_test.gen_connack(rc=0, proto_ver=proto_ver) | ||
connack_malformed = struct.pack("BBBBB", 0x02, 0x00, 0x01, 0xE0, 0x00) | ||
connack_malformed = struct.pack("BBBB", 0x29, 0x02, 0x00, 0x01) | ||
pingreq_packet = mosq_test.gen_pingreq() | ||
|
||
port = mosq_test.get_port() | ||
broker = mosq_test.start_broker(filename=os.path.basename(__file__), port=port) | ||
|
||
try: | ||
sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) | ||
sock.send(connack_malformed) | ||
try: | ||
mosq_test.do_send_receive(sock, pingreq_packet, b"", "pingreq") | ||
except ConnectionResetError: | ||
pass | ||
sock.close() | ||
|
||
# Does the broker still exist? | ||
sock = mosq_test.do_client_connect(connect_packet, connack_packet, port=port) | ||
mosq_test.do_ping(sock) | ||
sock.close() | ||
|
||
rc = 0 | ||
except mosq_test.TestError: | ||
pass | ||
finally: | ||
broker.terminate() | ||
broker.wait() | ||
(stdo, stde) = broker.communicate() | ||
if rc: | ||
print(stde.decode('utf-8')) | ||
print("proto_ver=%d" % (proto_ver)) | ||
exit(rc) | ||
|
||
|
||
do_test(proto_ver=3) | ||
do_test(proto_ver=4) | ||
do_test(proto_ver=5) | ||
exit(0) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters