mirror of
https://git.libssh.org/projects/libssh.git
synced 2026-02-11 10:40:27 +09:00
channels: Fix segfaults when the channel data is freed
Calling some channel procedures on a freed channel is always resulting in segmentation fault errors. The reason is that when a channel is freed with 'ssh_channel_do_free' procedure, its 'session' field is set to NULL; then when a channel procedure tries to access any field of 'channel->session' structure it is effectively dereferencing a NULL pointer. The change fixes that behavior by adding a check which ensures that a channel state is not SSH_CHANNEL_FLAG_FREED_LOCAL before accessing its parent session. Also the test suite is updated to check for the fixed errors, and the Doxygen documentation updated accordingly. There was a bug introduced in b0fb7d15: 'ssh_channel_poll', 'ssh_channel_poll_timeout' and 'ssh_channel_get_exit_status' would compare the channel state to the 'SSH_CHANNEL_FLAG_FREED_LOCAL' constant to check if the channel is alive. But the procedures must check the channel flags for the presence of 'SSH_CHANNEL_FLAG_FREED_LOCAL' bits instead. This change fixes the bug. Signed-off-by: Artyom V. Poptsov <poptsov.artyom@gmail.com> Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
committed by
Jakub Jelen
parent
76b7e0e9b5
commit
1ab2340644
@@ -3086,6 +3086,8 @@ int ssh_channel_read_nonblocking(ssh_channel channel,
|
|||||||
*
|
*
|
||||||
* @return The number of bytes available for reading, 0 if nothing
|
* @return The number of bytes available for reading, 0 if nothing
|
||||||
* is available or SSH_ERROR on error.
|
* is available or SSH_ERROR on error.
|
||||||
|
* When a channel is freed the function returns
|
||||||
|
* SSH_ERROR immediately.
|
||||||
*
|
*
|
||||||
* @warning When the channel is in EOF state, the function returns SSH_EOF.
|
* @warning When the channel is in EOF state, the function returns SSH_EOF.
|
||||||
*
|
*
|
||||||
@@ -3094,7 +3096,7 @@ int ssh_channel_read_nonblocking(ssh_channel channel,
|
|||||||
int ssh_channel_poll(ssh_channel channel, int is_stderr){
|
int ssh_channel_poll(ssh_channel channel, int is_stderr){
|
||||||
ssh_buffer stdbuf;
|
ssh_buffer stdbuf;
|
||||||
|
|
||||||
if(channel == NULL) {
|
if ((channel == NULL) || (channel->flags & SSH_CHANNEL_FLAG_FREED_LOCAL)) {
|
||||||
return SSH_ERROR;
|
return SSH_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3140,6 +3142,7 @@ int ssh_channel_poll(ssh_channel channel, int is_stderr){
|
|||||||
* SSH_ERROR on error.
|
* SSH_ERROR on error.
|
||||||
*
|
*
|
||||||
* @warning When the channel is in EOF state, the function returns SSH_EOF.
|
* @warning When the channel is in EOF state, the function returns SSH_EOF.
|
||||||
|
* When a channel is freed the function returns SSH_ERROR immediately.
|
||||||
*
|
*
|
||||||
* @see ssh_channel_is_eof()
|
* @see ssh_channel_is_eof()
|
||||||
*/
|
*/
|
||||||
@@ -3151,7 +3154,7 @@ int ssh_channel_poll_timeout(ssh_channel channel, int timeout, int is_stderr)
|
|||||||
size_t len;
|
size_t len;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
if (channel == NULL) {
|
if ((channel == NULL) || (channel->flags & SSH_CHANNEL_FLAG_FREED_LOCAL)) {
|
||||||
return SSH_ERROR;
|
return SSH_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3233,6 +3236,8 @@ static int ssh_channel_exit_status_termination(void *c){
|
|||||||
* (yet), or SSH_ERROR on error.
|
* (yet), or SSH_ERROR on error.
|
||||||
* @warning This function may block until a timeout (or never)
|
* @warning This function may block until a timeout (or never)
|
||||||
* if the other side is not willing to close the channel.
|
* if the other side is not willing to close the channel.
|
||||||
|
* When a channel is freed the function returns
|
||||||
|
* SSH_ERROR immediately.
|
||||||
*
|
*
|
||||||
* If you're looking for an async handling of this register a callback for the
|
* If you're looking for an async handling of this register a callback for the
|
||||||
* exit status.
|
* exit status.
|
||||||
@@ -3241,7 +3246,7 @@ static int ssh_channel_exit_status_termination(void *c){
|
|||||||
*/
|
*/
|
||||||
int ssh_channel_get_exit_status(ssh_channel channel) {
|
int ssh_channel_get_exit_status(ssh_channel channel) {
|
||||||
int rc;
|
int rc;
|
||||||
if(channel == NULL) {
|
if ((channel == NULL) || (channel->flags & SSH_CHANNEL_FLAG_FREED_LOCAL)) {
|
||||||
return SSH_ERROR;
|
return SSH_ERROR;
|
||||||
}
|
}
|
||||||
rc = ssh_handle_packets_termination(channel->session,
|
rc = ssh_handle_packets_termination(channel->session,
|
||||||
|
|||||||
@@ -258,6 +258,139 @@ static void torture_channel_delayed_close(void **state)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Ensure that calling 'ssh_channel_poll' on a freed channel does not lead to
|
||||||
|
* segmentation faults. */
|
||||||
|
static void torture_freed_channel_poll(void **state)
|
||||||
|
{
|
||||||
|
struct torture_state *s = *state;
|
||||||
|
ssh_session session = s->ssh.session;
|
||||||
|
ssh_channel channel;
|
||||||
|
|
||||||
|
char request[256];
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
snprintf(request, 256,
|
||||||
|
"dd if=/dev/urandom of=/tmp/file bs=64000 count=2; hexdump -C /tmp/file");
|
||||||
|
|
||||||
|
channel = ssh_channel_new(session);
|
||||||
|
assert_non_null(channel);
|
||||||
|
|
||||||
|
rc = ssh_channel_open_session(channel);
|
||||||
|
assert_ssh_return_code(session, rc);
|
||||||
|
|
||||||
|
/* Make the request, read parts with close */
|
||||||
|
rc = ssh_channel_request_exec(channel, request);
|
||||||
|
assert_ssh_return_code(session, rc);
|
||||||
|
|
||||||
|
ssh_channel_free(channel);
|
||||||
|
|
||||||
|
rc = ssh_channel_poll(channel, 0);
|
||||||
|
assert_int_equal(rc, SSH_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Ensure that calling 'ssh_channel_poll_timeout' on a freed channel does not
|
||||||
|
* lead to segmentation faults. */
|
||||||
|
static void torture_freed_channel_poll_timeout(void **state)
|
||||||
|
{
|
||||||
|
struct torture_state *s = *state;
|
||||||
|
ssh_session session = s->ssh.session;
|
||||||
|
ssh_channel channel;
|
||||||
|
|
||||||
|
char request[256];
|
||||||
|
char buff[256] = {0};
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
snprintf(request, 256,
|
||||||
|
"dd if=/dev/urandom of=/tmp/file bs=64000 count=2; hexdump -C /tmp/file");
|
||||||
|
|
||||||
|
channel = ssh_channel_new(session);
|
||||||
|
assert_non_null(channel);
|
||||||
|
|
||||||
|
rc = ssh_channel_open_session(channel);
|
||||||
|
assert_ssh_return_code(session, rc);
|
||||||
|
|
||||||
|
/* Make the request, read parts with close */
|
||||||
|
rc = ssh_channel_request_exec(channel, request);
|
||||||
|
assert_ssh_return_code(session, rc);
|
||||||
|
|
||||||
|
do {
|
||||||
|
rc = ssh_channel_read(channel, buff, 256, 0);
|
||||||
|
} while(rc > 0);
|
||||||
|
assert_ssh_return_code(session, rc);
|
||||||
|
|
||||||
|
ssh_channel_free(channel);
|
||||||
|
|
||||||
|
rc = ssh_channel_poll_timeout(channel, 500, 0);
|
||||||
|
assert_int_equal(rc, SSH_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Ensure that calling 'ssh_channel_read_nonblocking' on a freed channel does
|
||||||
|
* not lead to segmentation faults. */
|
||||||
|
static void torture_freed_channel_read_nonblocking(void **state)
|
||||||
|
{
|
||||||
|
struct torture_state *s = *state;
|
||||||
|
ssh_session session = s->ssh.session;
|
||||||
|
ssh_channel channel;
|
||||||
|
|
||||||
|
char request[256];
|
||||||
|
char buff[256] = {0};
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
snprintf(request, 256,
|
||||||
|
"dd if=/dev/urandom of=/tmp/file bs=64000 count=2; hexdump -C /tmp/file");
|
||||||
|
|
||||||
|
channel = ssh_channel_new(session);
|
||||||
|
assert_non_null(channel);
|
||||||
|
|
||||||
|
rc = ssh_channel_open_session(channel);
|
||||||
|
assert_ssh_return_code(session, rc);
|
||||||
|
|
||||||
|
/* Make the request, read parts with close */
|
||||||
|
rc = ssh_channel_request_exec(channel, request);
|
||||||
|
assert_ssh_return_code(session, rc);
|
||||||
|
|
||||||
|
ssh_channel_free(channel);
|
||||||
|
|
||||||
|
rc = ssh_channel_read_nonblocking(channel, buff, 256, 0);
|
||||||
|
assert_ssh_return_code_equal(session, rc, SSH_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Ensure that calling 'ssh_channel_get_exit_status' on a freed channel does not
|
||||||
|
* lead to segmentation faults. */
|
||||||
|
static void torture_freed_channel_get_exit_status(void **state)
|
||||||
|
{
|
||||||
|
struct torture_state *s = *state;
|
||||||
|
ssh_session session = s->ssh.session;
|
||||||
|
ssh_channel channel;
|
||||||
|
|
||||||
|
char request[256];
|
||||||
|
char buff[256] = {0};
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
snprintf(request, 256,
|
||||||
|
"dd if=/dev/urandom of=/tmp/file bs=64000 count=2; hexdump -C /tmp/file");
|
||||||
|
|
||||||
|
channel = ssh_channel_new(session);
|
||||||
|
assert_non_null(channel);
|
||||||
|
|
||||||
|
rc = ssh_channel_open_session(channel);
|
||||||
|
assert_ssh_return_code(session, rc);
|
||||||
|
|
||||||
|
/* Make the request, read parts with close */
|
||||||
|
rc = ssh_channel_request_exec(channel, request);
|
||||||
|
assert_ssh_return_code(session, rc);
|
||||||
|
|
||||||
|
do {
|
||||||
|
rc = ssh_channel_read(channel, buff, 256, 0);
|
||||||
|
} while(rc > 0);
|
||||||
|
assert_ssh_return_code(session, rc);
|
||||||
|
|
||||||
|
ssh_channel_free(channel);
|
||||||
|
|
||||||
|
rc = ssh_channel_get_exit_status(channel);
|
||||||
|
assert_ssh_return_code_equal(session, rc, SSH_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
int torture_run_tests(void) {
|
int torture_run_tests(void) {
|
||||||
int rc;
|
int rc;
|
||||||
struct CMUnitTest tests[] = {
|
struct CMUnitTest tests[] = {
|
||||||
@@ -276,6 +409,18 @@ int torture_run_tests(void) {
|
|||||||
cmocka_unit_test_setup_teardown(torture_channel_delayed_close,
|
cmocka_unit_test_setup_teardown(torture_channel_delayed_close,
|
||||||
session_setup,
|
session_setup,
|
||||||
session_teardown),
|
session_teardown),
|
||||||
|
cmocka_unit_test_setup_teardown(torture_freed_channel_poll,
|
||||||
|
session_setup,
|
||||||
|
session_teardown),
|
||||||
|
cmocka_unit_test_setup_teardown(torture_freed_channel_poll_timeout,
|
||||||
|
session_setup,
|
||||||
|
session_teardown),
|
||||||
|
cmocka_unit_test_setup_teardown(torture_freed_channel_read_nonblocking,
|
||||||
|
session_setup,
|
||||||
|
session_teardown),
|
||||||
|
cmocka_unit_test_setup_teardown(torture_freed_channel_get_exit_status,
|
||||||
|
session_setup,
|
||||||
|
session_teardown),
|
||||||
};
|
};
|
||||||
|
|
||||||
ssh_init();
|
ssh_init();
|
||||||
|
|||||||
Reference in New Issue
Block a user