Skip to content

Fix regression caused by missing exception handling when opening socket #1124

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

Merged
kabeor merged 1 commit into from
Apr 7, 2022
+10 −9
Merged

Fix regression caused by missing exception handling when opening socket #1124

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
19 changes: 10 additions & 9 deletions qiling/os/posix/syscall/socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,9 @@ def ql_bin_to_ip(ip):

def ql_syscall_socket(ql: Qiling, socket_domain, socket_type, socket_protocol):
idx = next((i for i in range(NR_OPEN) if ql.os.fd[i] is None), -1)
regreturn = idx

if idx == -1:
regreturn = -1
else:
if idx != -1:
# ql_socket.open should use host platform based socket_type.
try:
emu_socket_value = socket_type
Expand All @@ -88,12 +87,14 @@ def ql_syscall_socket(ql: Qiling, socket_domain, socket_type, socket_protocol):
ql.log.error(f'Cannot convert emu_socket_type {emu_socket_value} to host platform based socket_type')
raise

if ql.verbose >= QL_VERBOSE.DEBUG: # set REUSEADDR options under debug mode
ql.os.fd[idx] = ql_socket.open(socket_domain, socket_type, socket_protocol, (socket.SOL_SOCKET, socket.SO_REUSEADDR, 1))
else:
ql.os.fd[idx] = ql_socket.open(socket_domain, socket_type, socket_protocol)

regreturn = idx
try:
if ql.verbose >= QL_VERBOSE.DEBUG: # set REUSEADDR options under debug mode
ql.os.fd[idx] = ql_socket.open(socket_domain, socket_type, socket_protocol, (socket.SOL_SOCKET, socket.SO_REUSEADDR, 1))
else:
ql.os.fd[idx] = ql_socket.open(socket_domain, socket_type, socket_protocol)
except OSError as e: # May raise error: Protocol not supported
ql.log.debug(f'{e}: {socket_domain=}, {socket_type=}, {socket_protocol=}')
regreturn = -1

socket_type = socket_type_mapping(socket_type, ql.arch.type, ql.ostype)
socket_domain = socket_domain_mapping(socket_domain, ql.arch.type, ql.ostype)
Expand Down