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

Fix: query-watchdog: avoid issues on heap allocation failing #147

Merged
merged 3 commits into from
Mar 16, 2023
Merged

Fix: query-watchdog: avoid issues on heap allocation failing #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
030d7ed
Fix: query-watchdog: avoid issues on heap allocation failing
wenningerk Jul 21, 2022
48c9a11
Refactor: sbd-md: alloc/de-alloc reverse order
wenningerk Feb 3, 2023
0e4534e
spec: convert license naming to SPDX
wenningerk Feb 3, 2023
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
4 changes: 2 additions & 2 deletions sbd.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

Name: sbd
Summary: Storage-based death
License: GPLv2+
License: GPL-2.0-or-later
Group: System Environment/Daemons
Version: 1.5.2
Release: 99.%{buildnum}.%{shortcommit}.%{modified}git%{?dist}
Expand Down Expand Up @@ -95,7 +95,7 @@ Available rpmbuild rebuild options:

%package tests
Summary: Storage-based death environment for regression tests
License: GPLv2+
License: GPL-2.0-or-later
Group: System Environment/Daemons

%description tests
Expand Down
27 changes: 26 additions & 1 deletion src/sbd-common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,17 @@ watchdog_populate_list(void)
struct link_list_item *lli =
calloc(1, sizeof(struct link_list_item));

if (lli == NULL) {
break;
}
lli->dev_node = strdup(buf);
lli->link_name = strdup(entry_name);
if ((lli->dev_node == NULL) || (lli->link_name == NULL)) {
free(lli->dev_node);
free(lli->link_name);
free(lli);
break;
}
lli->next = link_list;
link_list = lli;
}
Expand All @@ -404,18 +413,27 @@ watchdog_populate_list(void)
if(!stat(entry_name, &statbuf) && S_ISCHR(statbuf.st_mode) &&
is_watchdog(statbuf.st_rdev)) {

int wdfd = watchdog_init_fd(entry_name, -1);
int wdfd;
struct watchdog_list_item *wdg =
calloc(1, sizeof(struct watchdog_list_item));
int len;
struct link_list_item *tmp_list = NULL;

if (wdg == NULL) {
break;
}

wdg->dev = statbuf.st_rdev;
wdg->dev_node = strdup(entry_name);
if (wdg->dev_node == NULL) {
free(wdg);
break;
}
wdg->next = watchdog_list;
watchdog_list = wdg;
watchdog_list_items++;

wdfd = watchdog_init_fd(entry_name, -1);
if (wdfd >= 0) {
struct watchdog_info ident;

Expand Down Expand Up @@ -450,11 +468,18 @@ watchdog_populate_list(void)
struct watchdog_list_item *dupe_wdg =
calloc(1, sizeof(struct watchdog_list_item));

if (dupe_wdg == NULL) {
break;
}
/* as long as we never purge watchdog_list
* there is no need to dupe strings
*/
*dupe_wdg = *wdg;
dupe_wdg->dev_node = strdup(tmp_list->link_name);
if (dupe_wdg->dev_node == NULL) {
free(dupe_wdg);
break;
}
dupe_wdg->next = watchdog_list;
watchdog_list = dupe_wdg;
watchdog_list_items++;
Expand Down
11 changes: 5 additions & 6 deletions src/sbd-md.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,9 +441,9 @@ init_device(struct sbd_context *st)
}
}

out: free(s_node);
out: free(s_mbox);
free(s_node);
free(s_header);
free(s_mbox);
return(rc);
}

Expand Down Expand Up @@ -556,9 +556,9 @@ slot_allocate(struct sbd_context *st, const char *name)
}
}

out: free(s_node);
out: free(s_mbox);
free(s_node);
free(s_header);
free(s_mbox);
return(rc);
}

Expand Down Expand Up @@ -1279,11 +1279,10 @@ int servant_md(const char *diskname, int mode, const void* argp)
}
}
out:
free(s_header);
free(s_node);
free(s_mbox);
free(s_header);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't s_mbox be first?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Allocation is done header, mbox and then node - so doing it the opposite direction here ...

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... at least that far the theory why it seemed to be more pleased with what I changed around line 560. It actually never complained about this here and iirc at some point it even stopped complaining about the stuff around 560. Had the impression it was some kind of tuning when they brought gcc into fedora. Just to avoid it next time ;-)

close_device(st);
exit(rc);
}