Commit 3b147be9 authored by Ethan Carter Edwards's avatar Ethan Carter Edwards Committed by Jakub Kicinski
Browse files

hamradio: baycom: replace strcpy() with strscpy() 

The strcpy() function has been deprecated and replaced with strscpy().
There is an effort to make this change treewide:
https://github.com/KSPP/linux/issues/88

.

Signed-off-by: default avatarEthan Carter Edwards <ethan@ethancedwards.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Link: https://patch.msgid.link/3qo3fbrak7undfgocsi2s74v4uyjbylpdqhie4dohfoh4welfn@joq7up65ug6v


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b341f6fd

drivers/net/hamradio/baycom_par.c

+2 −2
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static int baycom_ioctl(struct net_device *dev, void __user *data, 
		break;



	case HDLCDRVCTL_GETMODE:

		strcpy(hi->data.modename, bc->options ? "par96" : "picpar");

		strscpy(hi->data.modename, bc->options ? "par96" : "picpar");

		if (copy_to_user(data, hi, sizeof(struct hdlcdrv_ioctl)))

			return -EFAULT;

		return 0;
@@ -439,7 +439,7 @@ static int baycom_ioctl(struct net_device *dev, void __user *data, 
		return baycom_setmode(bc, hi->data.modename);



	case HDLCDRVCTL_MODELIST:

		strcpy(hi->data.modename, "par96,picpar");

		strscpy(hi->data.modename, "par96,picpar");

		if (copy_to_user(data, hi, sizeof(struct hdlcdrv_ioctl)))

			return -EFAULT;

		return 0;

drivers/net/hamradio/baycom_ser_fdx.c

+1 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ static int baycom_ioctl(struct net_device *dev, void __user *data, 
		return baycom_setmode(bc, hi->data.modename);



	case HDLCDRVCTL_MODELIST:

		strcpy(hi->data.modename, "ser12,ser3,ser24");

		strscpy(hi->data.modename, "ser12,ser3,ser24");

		if (copy_to_user(data, hi, sizeof(struct hdlcdrv_ioctl)))

			return -EFAULT;

		return 0;

drivers/net/hamradio/baycom_ser_hdx.c

+2 −2
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ static int baycom_ioctl(struct net_device *dev, void __user *data, 
		break;



	case HDLCDRVCTL_GETMODE:

		strcpy(hi->data.modename, "ser12");

		strscpy(hi->data.modename, "ser12");

		if (bc->opt_dcd <= 0)

			strcat(hi->data.modename, (!bc->opt_dcd) ? "*" : (bc->opt_dcd == -2) ? "@" : "+");

		if (copy_to_user(data, hi, sizeof(struct hdlcdrv_ioctl)))
@@ -584,7 +584,7 @@ static int baycom_ioctl(struct net_device *dev, void __user *data, 
		return baycom_setmode(bc, hi->data.modename);



	case HDLCDRVCTL_MODELIST:

		strcpy(hi->data.modename, "ser12");

		strscpy(hi->data.modename, "ser12");

		if (copy_to_user(data, hi, sizeof(struct hdlcdrv_ioctl)))

			return -EFAULT;

		return 0;