Skip to content

Conversation

@agiacomolli
Copy link
Contributor

@agiacomolli agiacomolli commented Jun 6, 2024

AppArmor changed the SECURITY_APPARMOR_HASH from sha1 to sha256 on the Linux kernel 6.8, thus breaking the apparmor_profiles table (#8344):

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=237c31cb5d83b3f77715f6d6a185f46a5ee4ec88

This adds a new sha256 column to the apparmor_profiles table to address this change.

@agiacomolli agiacomolli requested review from a team as code owners June 6, 2024 18:05
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Jun 6, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: agiacomolli / name: Anderson A. Giacomolli (c87ad70, 6018a59)

@Smjert
Copy link
Member

Smjert commented Jun 6, 2024

@agiacomolli thanks for chasing this issue. A quick suggestion to avoid a breaking change is to provide both columns and fill the one that's available, depending on the existence of the file, since osquery has to be backward compatible up to CentOS 7 now.

@agiacomolli
Copy link
Contributor Author

Thanks @Smjert! Do you think we can just return the status as I did or use a custom error message if the read fails?

@Smjert
Copy link
Member

Smjert commented Jul 3, 2024

Closing and reopening so that it picks up the CI changes.

@Smjert Smjert closed this Jul 3, 2024
@Smjert Smjert reopened this Jul 3, 2024
@zwass zwass force-pushed the change-apparmor-hash branch from 928bd38 to c87ad70 Compare July 3, 2024 18:17
@zwass
Copy link
Member

zwass commented Jul 3, 2024

I rebased as the CI still seemed to be hanging with the close/reopen.

@directionless directionless changed the title Change AppArmor profile hash Add sha256 hash to apparmor_profiles table Jul 4, 2024
@directionless directionless merged commit 9a46889 into osquery:master Jul 4, 2024
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