diff options
| author | Petr Mladek <pmladek@suse.com> | 2026-06-17 08:58:22 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2026-06-17 08:58:22 +0200 |
| commit | 2a706d98d50a28dd635b3d028531d839c1f5f19a (patch) | |
| tree | 0ba637c4bc75928b250c21dd4480ccd9344de14f /lib | |
| parent | 809967e0aed09a851ad7e3aa19fd1ac6ec464337 (diff) | |
| parent | 7cde5613006c1a1192efe3da3572d35a2fa5fbfe (diff) | |
Merge branch 'for-7.2-vsprintf-pmM-uppercase' into for-linus
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tests/printf_kunit.c | 2 | ||||
| -rw-r--r-- | lib/vsprintf.c | 22 |
2 files changed, 18 insertions, 6 deletions
diff --git a/lib/tests/printf_kunit.c b/lib/tests/printf_kunit.c index 58e639b01e83..eccf041ebd56 100644 --- a/lib/tests/printf_kunit.c +++ b/lib/tests/printf_kunit.c @@ -435,8 +435,10 @@ mac(struct kunit *kunittest) test("2d:48:d6:fc:7a:05", "%pM", addr); test("05:7a:fc:d6:48:2d", "%pMR", addr); + test("05:7A:FC:D6:48:2D", "%pMRU", addr); test("2d-48-d6-fc-7a-05", "%pMF", addr); test("2d48d6fc7a05", "%pm", addr); + test("2D48D6FC7A05", "%pmU", addr); test("057afcd6482d", "%pmR", addr); } diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 33e0778fca52..1c18d806cd4a 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -1310,31 +1310,39 @@ char *mac_address_string(char *buf, char *end, u8 *addr, char mac_addr[sizeof("xx:xx:xx:xx:xx:xx")]; char *p = mac_addr; int i; - char separator; + char separator = ':'; bool reversed = false; + bool uc = false; if (check_pointer(&buf, end, addr, spec)) return buf; switch (fmt[1]) { case 'F': + uc = fmt[2] == 'U'; separator = '-'; break; case 'R': + uc = fmt[2] == 'U'; reversed = true; - fallthrough; + break; + + case 'U': + uc = true; + break; default: - separator = ':'; break; } for (i = 0; i < 6; i++) { - if (reversed) - p = hex_byte_pack(p, addr[5 - i]); + u8 byte = reversed ? addr[5 - i] : addr[i]; + + if (uc) + p = hex_byte_pack_upper(p, byte); else - p = hex_byte_pack(p, addr[i]); + p = hex_byte_pack(p, byte); if (fmt[0] == 'M' && i != 5) *p++ = separator; @@ -2417,6 +2425,7 @@ early_param("no_hash_pointers", no_hash_pointers_enable); * - 'MF' For a 6-byte MAC FDDI address, it prints the address * with a dash-separated hex notation * - '[mM]R' For a 6-byte MAC address, Reverse order (Bluetooth) + * - '[mM][FR][U]' One of the above in the upper case * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way * IPv4 uses dot-separated decimal without leading 0's (1.2.3.4) * IPv6 uses colon separated network-order 16 bit hex with leading 0's @@ -2551,6 +2560,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, case 'm': /* Contiguous: 000102030405 */ /* [mM]F (FDDI) */ /* [mM]R (Reverse order; Bluetooth) */ + /* [mM][FR][U] (One of the above in the upper case) */ return mac_address_string(buf, end, ptr, spec, fmt); case 'I': /* Formatted IP supported * 4: 1.2.3.4 |