Commit 89f5349e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 238b05ec 7ddf0050

arch/x86/kernel/cpu/mce/dev-mcelog.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

arch/x86/kernel/rtc.c

+3 −6
Original line number Diff line number Diff line
@@ -138,17 +138,14 @@ 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)

			if (compare_pnp_id(dev->id, ids[i]) != 0)

				return 0;

		}

	}

	}

#endif

	if (!x86_platform.legacy.rtc)

		return -ENODEV;