Skip to content

fix: guard NULL part_ptr and license_list in slurmctld #202

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

Open
hossamazon wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −3
Open

fix: guard NULL part_ptr and license_list in slurmctld #202

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions src/slurmctld/job_mgr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12225,8 +12225,10 @@ static bool _valid_license_job_expansion(job_record_t *job_ptr1,
xstrchr(job_ptr2->licenses, '|'))
return false;

if (list_find_first_ro(job_ptr1->license_list, _find_hres, NULL) ||
list_find_first_ro(job_ptr2->license_list, _find_hres, NULL))
if ((job_ptr1->license_list &&
list_find_first_ro(job_ptr1->license_list, _find_hres, NULL)) ||
(job_ptr2->license_list &&
list_find_first_ro(job_ptr2->license_list, _find_hres, NULL)))
return false;

return true;
Expand Down
2 changes: 1 addition & 1 deletion src/slurmctld/node_mgr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4370,7 +4370,7 @@ extern void node_mgr_make_node_blocked(job_record_t *job_ptr, bool set)
if (!IS_JOB_WHOLE_TOPO(job_ptr))
return;

if (!job_ptr->job_resrcs || !job_ptr->job_resrcs->node_bitmap)
if (!job_ptr->job_resrcs || !job_ptr->job_resrcs->node_bitmap || !job_ptr->part_ptr)
return;

tmp_bitmap = bit_copy(job_ptr->job_resrcs->node_bitmap);
Expand Down