networkd:wpa_supplicant: driver fallback to nl80211 and/or wext (LP: #1814012)#240
Merged
slyon merged 4 commits intocanonical:mainfrom Oct 21, 2021
Merged
networkd:wpa_supplicant: driver fallback to nl80211 and/or wext (LP: #1814012)#240slyon merged 4 commits intocanonical:mainfrom
slyon merged 4 commits intocanonical:mainfrom
Conversation
Codecov Report
@@ Coverage Diff @@
## main #240 +/- ##
=======================================
Coverage 99.10% 99.10%
=======================================
Files 58 58
Lines 9792 9802 +10
=======================================
+ Hits 9704 9714 +10
Misses 88 88
Continue to review full report at Codecov.
|
schopin-pro
reviewed
Oct 13, 2021
slyon
reviewed
Oct 13, 2021
While expanding the generator tests, I noticed that the .service files being generated were being written world-writable (mode 0666). It seems only the wpa_supplicant .service generator was missing the umask(022) call used everywhere else (but nothing was testing for this). Luckily it seems that netplan when running for real uses a umask of 022 so .service files are (accidentally) not currently be written with mode 0666 in production that I could find. Add missing umask(022) call so even if the running umask breaks, the files won't be world-writable (which would likely lead to a local privilege escalation vulnerability for any systems configuring a "wifis" netplan section). Signed-off-by: Kees Cook <kees@ubuntu.com>
There was no content checking of the generated wpa_supplicant .service files. Add a templated check for this, leaving the '-D' option open-coded here, to be changed with the next patch. Signed-off-by: Kees Cook <kees@ubuntu.com>
The default behavior for wpa_supplicant under systemd is to try both nl80211 and wext drivers[1]. However, netplan was not specifying the same configuration, so wext devices had no way to be configured[2] by netplan. Add -Dnl80211,wext to the wpa_supplicant generated .service file and update tests accordingly. [1] https://salsa.debian.org/debian/wpa/-/blob/debian/unstable/debian/patches/networkd-driver-fallback.patch [2] https://bugs.launchpad.net/netplan/+bug/1814012 Signed-off-by: Kees Cook <kees@ubuntu.com>
Contributor
Author
|
Is anything else needed for this series to be accepted? Thanks! |
slyon
approved these changes
Oct 20, 2021
Contributor
There was a problem hiding this comment.
Thank you Kees for your contribution and for providing this workaround to wpa_supplicant.
LGTM!
But, how does your proposal here change the story? https://salsa.debian.org/debian/wpa/-/commit/50a3427f45214628dcd29ca9e58f9796bca13b79 Do we still want to get it landed in netplan, or do we just wait for the updated wpa_supplicant package (that already landed in Ubuntu Jammy as of a few hours ago).
Maybe we just want the "umask" change in this case?
Contributor
Author
|
It doesn't change anything, since netplan may be used on older wpa-supplecant, etc. |
slyon
changed the title
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Description
Adds tests to check the generated content of the wpa_supplicant .service files.
Fixes non-wired wpa_supplicant .service definition to use correct driver fallback list:
The default behavior for wpa_supplicant under systemd is to try both
nl80211 and wext drivers[1]. However, netplan was not specifying the
the same configuration, so wext devices had no way to be configured[2].
[1] https://salsa.debian.org/debian/wpa/-/blob/debian/unstable/debian/patches/networkd-driver-fallback.patch
[2] https://bugs.launchpad.net/netplan/+bug/1814012
Signed-off-by: Kees Cook kees@ubuntu.com
Checklist
make checksuccessfully.make check-coverage).