-
Notifications
You must be signed in to change notification settings - Fork 671
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.
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 #7693: concurrent task execution: fixed dereference of NULL #7694
base: main
Are you sure you want to change the base?
Conversation
if (!task) | ||
{ | ||
ereport(ERROR, (errmsg("task is invalid"))); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You message is not very helpful.
See around line 300 a similar pattern, here patched:
if (!task)
{
ereport(ERROR, (errmsg("no task found with taskid: %ld", handleEntry->taskid)));
}
Also I suggest to move your patch one line up (before the assignment).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if the error message should not be more strong: 'unexpected missing task id: ...;'
Maybe an Assert() given "task" is always expected to be set....
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ereport(ERROR, ...) doesn't return control
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm unsure what Citus guidelines are here but I don't think task is ever supposed to be NULL in this function.
That's why maybe an Assert() and not an ereport(ERROR)...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure whether the use of the "assert" is more appropriate, but the ereport(ERROR) is a normal shutdown in the event of errors.
|
||
if (!task || task->status == BACKGROUND_TASK_STATUS_CANCELLING) | ||
if (task->status == BACKGROUND_TASK_STATUS_CANCELLING) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that's a bit of a trouble, in the "else" part too it depends on task being set.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if exit the function earlier, it will not be trouble
In the function TaskConcurrentCancelCheck() the pointer "task" was utilized after checking against NULL, which can lead to dereference of the null pointer. To avoid the problem, added a separate handling of the case when the pointer is null with an interruption of execution. Fixes: 1f8675d("nonblocking concurrent task execution via background workers") Signed-off-by: Maksim Korotkov <[email protected]>
e51e314
to
73205b1
Compare
In the function TaskConcurrentCancelCheck() the pointer "task" was utilized after checking against NULL, which can lead to dereference of the null pointer.
To avoid the problem, added a separate handling of the case when the pointer is null with an interruption of execution.
Fixes: 1f8675d("nonblocking concurrent task execution via background workers")