morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 00:47:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19312 from yuwata/udev-escape-slash-nvme

Browse Source 
udev: make OPTIONS="string_escape=replace" take effect on ENV{key}= assiginment
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2021-06-25 10:11:04 +02:00
committed by GitHub
parent 07b1d28a16 5118e8e71d
commit 157306439e
9 changed files with 74 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/basic/socket-util.c
View File

@@ -748,6 +748,22 @@ static const char* const ip_tos_table[] = {
DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(ip_tos, int, 0xff);
bool ifname_valid_char(char a) {
if ((unsigned char) a >= 127U)
return false;
if ((unsigned char) a <= 32U)
return false;
if (IN_SET(a,
':', /* colons are used by the legacy "alias" interface logic */
'/', /* slashes cannot work, since we need to use network interfaces in sysfs paths, and in paths slashes are separators */
'%')) /* %d is used in the kernel's weird foo%d format string naming feature which we really really don't want to ever run into by accident */
return false;
return true;
}
bool ifname_valid_full(const char *p, IfnameValidFlags flags) {
bool numeric = true;
@@ -781,16 +797,7 @@ bool ifname_valid_full(const char *p, IfnameValidFlags flags) {
return false;
for (const char *t = p; *t; t++) {
if ((unsigned char) *t >= 127U)
return false;
if ((unsigned char) *t <= 32U)
return false;
if (IN_SET(*t,
':', /* colons are used by the legacy "alias" interface logic */
'/', /* slashes cannot work, since we need to use network interfaces in sysfs paths, and in paths slashes are separators */
'%')) /* %d is used in the kernel's weird foo%d format string naming feature which we really really don't want to ever run into by accident */
if (!ifname_valid_char(*t))
return false;
numeric = numeric && (*t >= '0' && *t <= '9');

1
src/basic/socket-util.h
View File

@@ -139,6 +139,7 @@ typedef enum {
IFNAME_VALID_NUMERIC = 1 << 1,
_IFNAME_VALID_ALL = IFNAME_VALID_ALTERNATIVE | IFNAME_VALID_NUMERIC,
} IfnameValidFlags;
bool ifname_valid_char(char a);
bool ifname_valid_full(const char *p, IfnameValidFlags flags);
static inline bool ifname_valid(const char *p) {
return ifname_valid_full(p, 0);