Skip to content

CDO: Handle .data..once sections. #1454

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

Merged
joe-lawrence merged 1 commit into from
Apr 28, 2025
+6 −3
Merged

CDO: Handle .data..once sections. #1454

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions kpatch-build/create-diff-object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,8 @@ static bool is_special_static(struct symbol *sym)
if (sym->type != STT_OBJECT || sym->bind != STB_LOCAL)
return false;

if (!strcmp(sym->sec->name, ".data.once"))
if (!strcmp(sym->sec->name, ".data.once") ||
!strcmp(sym->sec->name, ".data..once"))
return true;

for (var_name = var_names; *var_name; var_name++) {
Expand Down Expand Up @@ -1734,11 +1735,13 @@ static void kpatch_verify_patchability(struct kpatch_elf *kelf)

/*
* ensure we aren't including .data.* or .bss.*
* (.data.unlikely and .data.once is ok b/c it only has __warned vars)
* (.data.unlikely, .data.once, and .data..once is ok b/c it only
* has __warned vars)
*/
if (sec->include && sec->status != NEW &&
(!strncmp(sec->name, ".data", 5) || !strncmp(sec->name, ".bss", 4)) &&
(strcmp(sec->name, ".data.unlikely") && strcmp(sec->name, ".data.once"))) {
(strcmp(sec->name, ".data.unlikely") && strcmp(sec->name, ".data.once") &&
strcmp(sec->name, ".data..once"))) {
log_normal("data section %s selected for inclusion\n",
sec->name);
errs++;
Expand Down