diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-20 19:04:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-20 19:04:54 -0800 |
| commit | 89f5349e0673322857bd432fa23113af56673739 (patch) | |
| tree | 26f18db92cfa34cf33d9c5ead88db884a97743e7 | |
| parent | 238b05ec999a036872af52d23007a7fc5a2df74e (diff) | |
| parent | 7ddf0050a21fdcc025c3cb1055fe3db60df1cd97 (diff) | |
| download | linux-89f5349e0673322857bd432fa23113af56673739.tar.gz | |
Merge tag 'x86-platform-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform update from Ingo Molnar:
- Simplify add_rtc_cmos()
- Use strscpy() in the mcelog code
* tag 'x86-platform-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mce/dev-mcelog: use strscpy() to instead of strncpy()
x86/rtc: Simplify PNP ids check
| -rw-r--r-- | arch/x86/kernel/cpu/mce/dev-mcelog.c | 3 | ||||
| -rw-r--r-- | arch/x86/kernel/rtc.c | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/arch/x86/kernel/cpu/mce/dev-mcelog.c b/arch/x86/kernel/cpu/mce/dev-mcelog.c index 100fbeebdc728a..a05ac0716ecfb9 100644 --- a/arch/x86/kernel/cpu/mce/dev-mcelog.c +++ b/arch/x86/kernel/cpu/mce/dev-mcelog.c @@ -105,8 +105,7 @@ static ssize_t set_trigger(struct device *s, struct device_attribute *attr, { char *p; - strncpy(mce_helper, buf, sizeof(mce_helper)); - mce_helper[sizeof(mce_helper)-1] = 0; + strscpy(mce_helper, buf, sizeof(mce_helper)); p = strchr(mce_helper, '\n'); if (p) diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index 34904643451332..1309b9b053386b 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c @@ -138,15 +138,12 @@ static __init int add_rtc_cmos(void) static const char * const ids[] __initconst = { "PNP0b00", "PNP0b01", "PNP0b02", }; struct pnp_dev *dev; - struct pnp_id *id; int i; pnp_for_each_dev(dev) { - for (id = dev->id; id; id = id->next) { - for (i = 0; i < ARRAY_SIZE(ids); i++) { - if (compare_pnp_id(id, ids[i]) != 0) - return 0; - } + for (i = 0; i < ARRAY_SIZE(ids); i++) { + if (compare_pnp_id(dev->id, ids[i]) != 0) + return 0; } } #endif |