tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'x86-platform-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
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
This commit is contained in:
Linus Torvalds
2023-02-20 19:04:54 -08:00
parent 238b05ec99 7ddf0050a2
commit 89f5349e06
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/x86/kernel/cpu/mce/dev-mcelog.c
+1 -2
View File
@@ -105,8 +105,7 @@ static ssize_t set_trigger(struct device *s, struct device_attribute *attr,
{ {
char *p; char *p;
strncpy(mce_helper, buf, sizeof(mce_helper)); strscpy(mce_helper, buf, sizeof(mce_helper));
mce_helper[sizeof(mce_helper)-1] = 0;
p = strchr(mce_helper, '\n'); p = strchr(mce_helper, '\n');
if (p) if (p)
arch/x86/kernel/rtc.c
+3 -6
View File
@@ -138,15 +138,12 @@ static __init int add_rtc_cmos(void)
static const char * const ids[] __initconst = static const char * const ids[] __initconst =
{ "PNP0b00", "PNP0b01", "PNP0b02", }; { "PNP0b00", "PNP0b01", "PNP0b02", };
struct pnp_dev *dev; struct pnp_dev *dev;
struct pnp_id *id;
int i; int i;
pnp_for_each_dev(dev) { pnp_for_each_dev(dev) {
for (id = dev->id; id; id = id->next) { for (i = 0; i < ARRAY_SIZE(ids); i++) {
for (i = 0; i < ARRAY_SIZE(ids); i++) { if (compare_pnp_id(dev->id, ids[i]) != 0)
if (compare_pnp_id(id, ids[i]) != 0) return 0;
return 0;
}
} }
} }
#endif #endif