Skip to content
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

apps: linux_rpc_demo: Do not access members of rpmsg_endpoint #566

Merged
merged 2 commits into from
Apr 17, 2024
Merged

apps: linux_rpc_demo: Do not access members of rpmsg_endpoint #566

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ea48a3
apps: linux_rpc_demo: Do not access members of rpmsg_endpoint
glneo Mar 15, 2024
43ba239
apps: linux_rpc_demo: Remove endpoint check when not used
glneo Mar 29, 2024
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
24 changes: 11 additions & 13 deletions apps/examples/linux_rpc_demo/linux_rpc_demod.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,9 @@ int rpmsg_handle_open(void *data, struct rpmsg_rpc_svr *rpcs)
char *buf;
struct rpmsg_rpc_resp_open rpc_open_resp;
int payload_size = sizeof(rpc_open_resp);
struct rpmsg_endpoint *ept = &rpcs->ept;
int fd, ret;

if (!rpc_open_req || !ept)
if (!rpc_open_req)
return -EINVAL;
buf = rpc_open_req->filename;

Expand All @@ -107,11 +106,10 @@ int rpmsg_handle_close(void *data, struct rpmsg_rpc_svr *rpcs)
void *req_ptr = data + MAX_FUNC_ID_LEN;
struct rpmsg_rpc_req_close *rpc_close_req = req_ptr;
struct rpmsg_rpc_resp_close rpc_close_resp;
struct rpmsg_endpoint *ept = &rpcs->ept;
int payload_size = sizeof(rpc_close_resp);
int ret;

if (!rpc_close_req || !ept)
if (!rpc_close_req)
return -EINVAL;

/* Close remote fd */
Expand All @@ -132,12 +130,11 @@ int rpmsg_handle_read(void *data, struct rpmsg_rpc_svr *rpcs)
void *req_ptr = data + MAX_FUNC_ID_LEN;
struct rpmsg_rpc_req_read *rpc_read_req = req_ptr;
struct rpmsg_rpc_resp_read rpc_read_resp;
struct rpmsg_endpoint *ept = &rpcs->ept;
unsigned long int bytes_read;
int payload_size = sizeof(rpc_read_resp);
int ret;

if (!rpc_read_req || !ept)
if (!rpc_read_req)
return -EINVAL;

if (rpc_read_req->fd == 0) {
Expand Down Expand Up @@ -168,12 +165,11 @@ int rpmsg_handle_write(void *data, struct rpmsg_rpc_svr *rpcs)
void *req_ptr = data + MAX_FUNC_ID_LEN;
struct rpmsg_rpc_req_write *rpc_write_req = req_ptr;
struct rpmsg_rpc_resp_write rpc_write_resp;
struct rpmsg_endpoint *ept = &rpcs->ept;
int payload_size = sizeof(rpc_write_resp);
int bytes_written;
int ret;

if (!rpc_write_req || !ept)
if (!rpc_write_req)
return -EINVAL;

/* Write to remote fd */
Expand All @@ -195,12 +191,11 @@ int rpmsg_handle_input(void *data, struct rpmsg_rpc_svr *rpcs)
void *req_ptr = data + MAX_FUNC_ID_LEN;
struct rpmsg_rpc_req_input *rpc_input_req = req_ptr;
struct rpmsg_rpc_resp_input rpc_input_resp;
struct rpmsg_endpoint *ept = &rpcs->ept;
int bytes_read;
int payload_size = sizeof(rpc_input_resp);
int ret;

if (!rpc_input_req || !ept)
if (!rpc_input_req)
return -EINVAL;

/* Input from remote */
Expand All @@ -221,10 +216,13 @@ int rpmsg_handle_term(void *data, struct rpmsg_rpc_svr *rpcs)
{
void *req_ptr = data + MAX_FUNC_ID_LEN;
struct rpmsg_rpc_req_term *rpc_term_req = req_ptr;
struct rpmsg_endpoint *ept = &rpcs->ept;
(void)rpcs;

printf("Received termination request at id %d from endpoint %s\r\n",
rpc_term_req->id, ept->name);
if (!rpc_term_req)
return -EINVAL;

printf("Received termination request at id %d\r\n",
rpc_term_req->id);
request_termination = 1;

return 0;
Expand Down
Loading