powerpc/pseries: Remove VLA from lparcfg_write() (74422e2b) · Commits · 戴 / test

In lparcfg_write we hard code kbuf_sz and then use this as the variable length of kbuf creating a variable length array. Since we're hard coding the length anyway just define the array using this as the length and remove the need for kbuf_sz, thus removing the variable length array. Signed-off-by:

Suraj Jitindar Singh <sjitindarsingh@gmail.com> Reviewed-by:

Joel Stanley <joel@jms.id.au> Signed-off-by:

Michael Ellerman <mpe@ellerman.id.au>

arch/powerpc/platforms/pseries/lparcfg.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -585,8 +585,7 @@ static ssize_t update_mpp(u64 entitlement, u8 weight)
		static ssize_t lparcfg_write(struct file file, const char __user buf,
		size_t count, loff_t * off)
		{
		int kbuf_sz = 64;
		char kbuf[kbuf_sz];
		char kbuf[64];
		char *tmp;
		u64 new_entitled, *new_entitled_ptr = &new_entitled;
		u8 new_weight, *new_weight_ptr = &new_weight;
		@@ -595,7 +594,7 @@ static ssize_t lparcfg_write(struct file file, const char __user buf,
		if (!firmware_has_feature(FW_FEATURE_SPLPAR))
		return -EINVAL;

		if (count > kbuf_sz)
		if (count > sizeof(kbuf))
		return -EINVAL;

		if (copy_from_user(kbuf, buf, count))

Admin message