iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/thermal: Remove unused 'mds' and 'nrhandler' variables

Browse Source 
In the previous code, the 'mds' and 'nrhandler' variables were not
utilized in the codebase. Additionally, there was a potential NULL
pointer dereference and memory leak due to improper handling of memory
reallocation failure.

This patch removes the unused 'mds' and 'nrhandler' variables along with
the associated code, addressing the unused variable issue, NULL pointer
dereference issue and the memory leak issue.

Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20230926173736.1142420-1-visitorckw@gmail.com
This commit is contained in:
Kuan-Wei Chiu 2023-09-27 01:37:36 +08:00 committed by Daniel Lezcano
parent ebd1dea94b
commit de84da588f
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/thermal/lib/mainloop.c
View File

@ -9,7 +9,6 @@
#include "log.h" #include "log.h"
static int epfd = -1; static int epfd = -1;
static unsigned short nrhandler;
static sig_atomic_t exit_mainloop; static sig_atomic_t exit_mainloop;
struct mainloop_data { struct mainloop_data {
@ -18,8 +17,6 @@ struct mainloop_data {
int fd; int fd;
}; };
static struct mainloop_data **mds;
#define MAX_EVENTS 10 #define MAX_EVENTS 10
int mainloop(unsigned int timeout) int mainloop(unsigned int timeout)
@ -61,13 +58,6 @@ int mainloop_add(int fd, mainloop_callback_t cb, void *data)
struct mainloop_data *md; struct mainloop_data *md;
if (fd >= nrhandler) {
mds = realloc(mds, sizeof(*mds) * (fd + 1));
if (!mds)
return -1;
nrhandler = fd + 1;
}
md = malloc(sizeof(*md)); md = malloc(sizeof(*md));
if (!md) if (!md)
return -1; return -1;
@ -76,7 +66,6 @@ int mainloop_add(int fd, mainloop_callback_t cb, void *data)
md->cb = cb; md->cb = cb;
md->fd = fd; md->fd = fd;
mds[fd] = md;
ev.data.ptr = md; ev.data.ptr = md;
if (epoll_ctl(epfd, EPOLL_CTL_ADD, fd, &ev) < 0) { if (epoll_ctl(epfd, EPOLL_CTL_ADD, fd, &ev) < 0) {
@ -89,14 +78,9 @@ int mainloop_add(int fd, mainloop_callback_t cb, void *data)
int mainloop_del(int fd) int mainloop_del(int fd)
{ {
if (fd >= nrhandler)
return -1;
if (epoll_ctl(epfd, EPOLL_CTL_DEL, fd, NULL) < 0) if (epoll_ctl(epfd, EPOLL_CTL_DEL, fd, NULL) < 0)
return -1; return -1;
free(mds[fd]);
return 0; return 0;
} }