Commit ad3b2d61 authored by Oliver Neukum's avatar Oliver Neukum Committed by Wen Zhiwei
Browse files

Revert "usb: yurex: Replace snprintf() with the safer scnprintf() variant" 

stable inclusion
from stable-v6.6.57
commit 936564b4dafa98117b1f1d16f23f9cd7e397a5d7
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB2M97

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=936564b4dafa98117b1f1d16f23f9cd7e397a5d7



--------------------------------

commit 71c717cd8a2e180126932cc6851ff21c1d04d69a upstream.

This reverts commit 86b20af11e84c26ae3fde4dcc4f490948e3f8035.

This patch leads to passing 0 to simple_read_from_buffer()
as a fifth argument, turning the read method into a nop.
The change is fundamentally flawed, as it breaks the driver.

Signed-off-by: default avatarOliver Neukum <oneukum@suse.com>
Cc: stable <stable@kernel.org>
Link: https://lore.kernel.org/r/20241007094004.242122-1-oneukum@suse.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent e5b8d221

drivers/usb/misc/yurex.c

+8 −11
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 
#define YUREX_BUF_SIZE		8

#define YUREX_WRITE_TIMEOUT	(HZ*2)



#define MAX_S64_STRLEN 20 /* {-}922337203685477580{7,8} */



/* table of devices that work with this driver */

static struct usb_device_id yurex_table[] = {

	{ USB_DEVICE(YUREX_VENDOR_ID, YUREX_PRODUCT_ID) },
@@ -403,7 +401,8 @@ static ssize_t yurex_read(struct file *file, char __user *buffer, size_t count, 
{

	struct usb_yurex *dev;

	int len = 0;

	char in_buffer[MAX_S64_STRLEN];

	char in_buffer[20];

	unsigned long flags;



	dev = file->private_data;
@@ -413,15 +412,13 @@ static ssize_t yurex_read(struct file *file, char __user *buffer, size_t count, 
		return -ENODEV;

	}



	if (WARN_ON_ONCE(dev->bbu > S64_MAX || dev->bbu < S64_MIN)) {

	spin_lock_irqsave(&dev->lock, flags);

	len = snprintf(in_buffer, 20, "%lld\n", dev->bbu);

	spin_unlock_irqrestore(&dev->lock, flags);

	mutex_unlock(&dev->io_mutex);

		return -EIO;

	}



	spin_lock_irq(&dev->lock);

	scnprintf(in_buffer, MAX_S64_STRLEN, "%lld\n", dev->bbu);

	spin_unlock_irq(&dev->lock);

	mutex_unlock(&dev->io_mutex);

	if (WARN_ON_ONCE(len >= sizeof(in_buffer)))

		return -EIO;



	return simple_read_from_buffer(buffer, count, ppos, in_buffer, len);

}