net: redirect nftables stdout and stderr to log CRIU's log file #2549
Conversation
This file contains 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
When using the nftables network locking backend and restoring a process a second time the network locking has already been deleted by the first restore. The second restore will print out to the console text like: Error: Could not process rule: No such file or directory delete table inet CRIU-202621 With this change CRIU's log FD is used by linbftables stdout and stderr. Signed-off-by: Adrian Reber <[email protected]>
rst0git
reviewed
Dec 17, 2024
| goto err3; | ||
| } | ||
| nft_ctx_set_output(nft, fp); | ||
| nft_ctx_set_error(nft, fp); |
There was a problem hiding this comment.
The code in nftables_lock_network_internal() and nftables_network_unlock() looks very similar.
Would it make sense to create a function?
static inline int nftables_set_logfd(struct nft_ctx *nft)
{
FILE *fp;
fp = fdopen(log_get_fd(), "w");
if (!fp) {
pr_perror("fdopen() failed");
return -1;
}
nft_ctx_set_output(nft, fp);
nft_ctx_set_error(nft, fp);
fflush(fp);
fclose(fp);
return 0;
}We can use this function in nftables_lock_network_internal():
if (nftables_set_logfd(nft)) {
goto err2;
}and in nftables_network_unlock():
if (nftables_set_logfd(nft)) {
nft_ctx_free(nft);
return -1;
}
There was a problem hiding this comment.
The nft_ctx_set_output() and nft_ctx_set_error() functions set the output or error file pointer in ctx to the value of fp. They return the previous value to aid in temporary file pointer overrides. On error, these functions return NULL.
nftables_set_logfd can't close fp...
|
It looks like the changes in this pull request are also applied in #2550 |
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.
When using the nftables network locking backend and restoring a process a second time the network locking has already been deleted by the first restore. The second restore will print out to the console text like:
With this change CRIU's log FD is used by linbftables stdout and stderr.