From 81aa19c303c94f549cb9ae343cfe4b635b4e888c Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 14 Feb 2023 07:03:11 -0700 Subject: Do not cast away const in agent_run_command While investigating something else, I noticed some weird code in agent_run_command (use of memcpy rather than strcpy). Then I noticed that 'cmd' is used as both an in and out parameter, despite being const. Casting away const like this is bad. This patch removes the const and fixes the memcpy. I also added a static assert to assure myself that the code in gdbserver is correct -- gdbserver is passing its own buffer directly to agent_run_command. Reviewed-By: Andrew Burgess --- gdbsupport/agent.cc | 14 ++++++++------ gdbsupport/agent.h | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'gdbsupport') diff --git a/gdbsupport/agent.cc b/gdbsupport/agent.cc index 531807be3d2..81c925dd99d 100644 --- a/gdbsupport/agent.cc +++ b/gdbsupport/agent.cc @@ -179,14 +179,16 @@ gdb_connect_sync_socket (int pid) #endif } -/* Execute an agent command in the inferior. PID is the value of pid of the - inferior. CMD is the buffer for command. GDB or GDBserver will store the - command into it and fetch the return result from CMD. The interaction - between GDB/GDBserver and the agent is synchronized by a synchronization - socket. Return zero if success, otherwise return non-zero. */ +/* Execute an agent command in the inferior. PID is the value of pid + of the inferior. CMD is the buffer for command. It is assumed to + be at least IPA_CMD_BUF_SIZE bytes long. GDB or GDBserver will + store the command into it and fetch the return result from CMD. + The interaction between GDB/GDBserver and the agent is synchronized + by a synchronization socket. Return zero if success, otherwise + return non-zero. */ int -agent_run_command (int pid, const char *cmd, int len) +agent_run_command (int pid, char *cmd, int len) { int fd; int tid = agent_get_helper_thread_id (); diff --git a/gdbsupport/agent.h b/gdbsupport/agent.h index dceb33f6bd5..7a258e267a5 100644 --- a/gdbsupport/agent.h +++ b/gdbsupport/agent.h @@ -22,7 +22,7 @@ #include "gdbsupport/preprocessor.h" -int agent_run_command (int pid, const char *cmd, int len); +int agent_run_command (int pid, char *cmd, int len); int agent_look_up_symbols (void *); -- cgit v1.2.1