Fix kernel BUG in apm.c when tfw_apm_global_data is uninitialized (#2424) #2429
+22
−6
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
krizhanovsky
requested changes
May 22, 2025
fw/procfs.c
Outdated
| unsigned int val[T_PSZ] = { 0 }; | ||
| TfwPrcntlStats pstats = {.val = val}; | ||
|
|
||
| if (!ss_stat) | ||
| T_WARN("Cannot allocate sync sockets statistics\n"); | ||
| T_WARN("Cannot allocate sync sockets statistics\n"); |
There was a problem hiding this comment.
Spaces in identation, tabs must be used. Please check other places in the PR replacing tabs/spaces
| seq_printf(seq, "%02d%%:\t%dms\n", | ||
| pstats.ith[i], pstats.val[i]); | ||
|
|
||
| skip_apm: |
There was a problem hiding this comment.
Suggested change
| skip_apm: | |
| skip_apm: |
And other identation issues
| memset(pstats, 0, sizeof(*pstats)); | ||
| return -ENODATA; | ||
| } | ||
| return __tfw_apm_stats(tfw_apm_global_data, pstats); |
There was a problem hiding this comment.
also identation issues
fw/apm.c
Outdated
| BUG_ON(!tfw_apm_global_data); | ||
| return __tfw_apm_stats(tfw_apm_global_data, pstats); | ||
| if (!tfw_apm_global_data) { | ||
| pr_warn("tfw_apm: global data not initialized, skipping stats\n"); |
There was a problem hiding this comment.
Please use our logging facilities, e.g. T_WARN(). But it seems this is a normal case, so maybe we should use T_DBG instead
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes a kernel BUG triggered at apm.c:1050 when tfw_apm_global_data is not initialized.
Instead of crashing, the system now gracefully falls back to showing "n/a" for the APM stats in /proc output, similar to how SS statistics are handled.
Fixes: #2424