Skip to content

Commit

Permalink
power: fix sanity checks for guest channel read
Browse files Browse the repository at this point in the history
[ upstream commit 1fe00fd ]

In function power_guest_channel_read_msg, 'lcore_id' is used before
validity check, which may cause buffer 'global_fds' accessed by index
'lcore_id' overflow.

This patch moves the validity check of 'lcore_id' before the 'lcore_id'
being used for the first time.

Fixes: 9dc843e ("power: extend guest channel API for reading")

Signed-off-by: Hongbo Zheng <zhenghongbo3@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
Reviewed-by: Reshma Pattan <reshma.pattan@intel.com>
Acked-by: David Hunt <david.hunt@intel.com>
  • Loading branch information
Hongbo Zheng authored and cpaelzer committed Jun 10, 2021
1 parent 5f49a5b commit ae9f704
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions lib/librte_power/guest_channel.c
Expand Up @@ -140,6 +140,17 @@ int power_guest_channel_read_msg(void *pkt,
if (pkt_len == 0 || pkt == NULL)
return -1;

if (lcore_id >= RTE_MAX_LCORE) {
RTE_LOG(ERR, GUEST_CHANNEL, "Channel(%u) is out of range 0...%d\n",
lcore_id, RTE_MAX_LCORE-1);
return -1;
}

if (global_fds[lcore_id] < 0) {
RTE_LOG(ERR, GUEST_CHANNEL, "Channel is not connected\n");
return -1;
}

fds.fd = global_fds[lcore_id];
fds.events = POLLIN;

Expand All @@ -153,17 +164,6 @@ int power_guest_channel_read_msg(void *pkt,
return -1;
}

if (lcore_id >= RTE_MAX_LCORE) {
RTE_LOG(ERR, GUEST_CHANNEL, "Channel(%u) is out of range 0...%d\n",
lcore_id, RTE_MAX_LCORE-1);
return -1;
}

if (global_fds[lcore_id] < 0) {
RTE_LOG(ERR, GUEST_CHANNEL, "Channel is not connected\n");
return -1;
}

while (pkt_len > 0) {
ret = read(global_fds[lcore_id],
pkt, pkt_len);
Expand Down

0 comments on commit ae9f704

Please sign in to comment.