fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-11 05:10:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/rfkill: don't assert for valid string in rfkill_type_to_enum()

Browse source 
"str" comes from udev. This is not a trusted component, and we must not assert
for valid input.
This commit is contained in:
Thomas Haller 2022-02-01 22:41:27 +01:00
parent a19ca08bcf
commit 96abd25c72
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/core/nm-rfkill-manager.c
View file

@ -259,12 +259,12 @@ killswitch_find_by_name(NMRfkillManager *self, const char *name)
static NMRfkillType
rfkill_type_to_enum(const char *str)
{
g_return_val_if_fail(str != NULL, NM_RFKILL_TYPE_UNKNOWN);
if (!strcmp(str, "wlan"))
return NM_RFKILL_TYPE_WLAN;
else if (!strcmp(str, "wwan"))
return NM_RFKILL_TYPE_WWAN;
if (str) {
if (nm_streq(str, "wlan"))
return NM_RFKILL_TYPE_WLAN;
if (nm_streq(str, "wwan"))
return NM_RFKILL_TYPE_WWAN;
}
return NM_RFKILL_TYPE_UNKNOWN;
}
@ -273,12 +273,10 @@ static void
add_one_killswitch(NMRfkillManager *self, struct udev_device *device)
{
NMRfkillManagerPrivate *priv = NM_RFKILL_MANAGER_GET_PRIVATE(self);
const char *str_type;
NMRfkillType rtype;
Killswitch *ks;
str_type = udev_device_get_property_value(device, "RFKILL_TYPE");
rtype = rfkill_type_to_enum(str_type);
rtype = rfkill_type_to_enum(udev_device_get_property_value(device, "RFKILL_TYPE"));
if (rtype == NM_RFKILL_TYPE_UNKNOWN)
return;