Skip to content

out_s3: guard current_buffer_size subtraction against underflow #12271

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
univbyn-blip wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −1
Open

out_s3: guard current_buffer_size subtraction against underflow #12271

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
14 changes: 13 additions & 1 deletion plugins/out_s3/s3_store.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,19 @@ int s3_store_file_delete(struct flb_s3 *ctx, struct s3_file *s3_file)
struct flb_fstore_file *fsf;

fsf = s3_file->fsf;
ctx->current_buffer_size -= s3_file->size;

/*
* Files recovered from a previous run are not accounted into
* current_buffer_size at startup, so guard the subtraction to keep
* the unsigned counter from underflowing; a wrapped counter makes
* the store_dir_limit_size check reject every new chunk.
*/
if (ctx->current_buffer_size >= s3_file->size) {
ctx->current_buffer_size -= s3_file->size;
}
else {
ctx->current_buffer_size = 0;
}

/* permanent deletion */
flb_fstore_file_delete(ctx->fs, fsf);
Expand Down
Loading