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.

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(test,userspace): fixed strncat usage. #1113

Merged
merged 1 commit into from
May 23, 2023
Merged

fix(test,userspace): fixed strncat usage. #1113

merged 1 commit into from
May 23, 2023

Conversation

FedeDP
Copy link
Contributor

@FedeDP FedeDP commented May 23, 2023

What type of PR is this?

/kind bug

Any specific area of the project related to this PR?

/area libscap-engine-bpf
/area libscap-engine-modern-bpf
/area libsinsp
/area tests

Does this PR require a change in the driver versions?

What this PR does / why we need it:

Correct usage of strncat to avoid buffer overflows:

If src contains n or more bytes, strncat() writes n+1 bytes to dest (n from src plus the terminating null byte). Therefore, the size of dest must be at least strlen(dest)+n+1.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

@FedeDP
Copy link
Contributor Author

FedeDP commented May 23, 2023

/milestone 0.11.0

@poiana poiana added this to the 0.11.0 milestone May 23, 2023
@FedeDP
Copy link
Contributor Author

FedeDP commented May 23, 2023

/cc @incertum @LucaGuerra

@@ -46,9 +46,9 @@ static inline void err_append(char* s, const char* suffix, const char* sep)
{
if (*s != '\0')
{
strncat(s, sep, PLUGIN_MAX_ERRLEN - strlen(sep));
strncat(s, sep, PLUGIN_MAX_ERRLEN - strlen(s) - 1);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jasondellaluce this should be good, right?
You want to check that you have enough space in dest (ie: s) to hold sep up until

PLUGIN_MAX_ERRLEN - strlen(s) - 1

bytes.
Same goes below.

Copy link
Contributor

Choose a reason for hiding this comment

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

Right!

Copy link
Contributor

@LucaGuerra LucaGuerra left a comment

Choose a reason for hiding this comment

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

I think it works for now but I'd be happier if we could implement strlcat and ban strncat.

Copy link
Contributor

@incertum incertum left a comment

Choose a reason for hiding this comment

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

/approve

/hold

@jasondellaluce please confirm @FedeDP question.

@LucaGuerra agree with implementing strlcat in the future.

@poiana
Copy link
Contributor

poiana commented May 23, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: FedeDP, incertum, jasondellaluce, LucaGuerra

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [FedeDP,LucaGuerra,incertum,jasondellaluce]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@incertum
Copy link
Contributor

/unhold

@poiana poiana merged commit baeba9f into master May 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants