[PATCH 01/35] fbdev: matroxfb: Use safer strscpy() instead of strcpy()
Ai Chao <[email protected]>
| Newsgroups | org.kernel.vger.linux-parisc,org.freedesktop.lists.dri-devel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-fbdev,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
Use a safer function strscpy() instead of strcpy() for copying to arrays. Only idiomatic code replacement, and no functional changes. Signed-off-by: Ai Chao <[email protected]> --- drivers/video/fbdev/matrox/matroxfb_base.c | 6 +++--- drivers/video/fbdev/matrox/matroxfb_crtc2.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c index e1a4bc7c2318..bd786543478c 100644 --- a/drivers/video/fbdev/matrox/matroxfb_base.c +++ b/drivers/video/fbdev/matrox/matroxfb_base.c @@ -709,7 +709,7 @@ static void matroxfb_init_fix(struct matrox_fb_info *minfo) struct fb_fix_screeninfo *fix = &minfo->fbcon.fix; DBG(__func__) - strcpy(fix->id,"MATROX"); + strscpy(fix->id, "MATROX"); fix->xpanstep = 8; /* 8 for 8bpp, 4 for 16bpp, 2 for 32bpp */ fix->ypanstep = 1; @@ -1091,8 +1091,8 @@ static int matroxfb_ioctl(struct fb_info *info, struct v4l2_capability r; memset(&r, 0, sizeof(r)); - strcpy(r.driver, "matroxfb"); - strcpy(r.card, "Matrox"); + strscpy(r.driver, "matroxfb"); + strscpy(r.card, "Matrox"); sprintf(r.bus_info, "PCI:%s", pci_name(minfo->pcidev)); r.version = KERNEL_VERSION(1,0,0); r.capabilities = V4L2_CAP_VIDEO_OUTPUT; diff --git a/drivers/video/fbdev/matrox/matroxfb_crtc2.c b/drivers/video/fbdev/matrox/matroxfb_crtc2.c index 8de882b09a24..c20dd06c5fcd 100644 --- a/drivers/video/fbdev/matrox/matroxfb_crtc2.c +++ b/drivers/video/fbdev/matrox/matroxfb_crtc2.c @@ -299,7 +299,7 @@ static void matroxfb_dh_init_fix(struct matroxfb_dh_fb_info *m2info) { struct fb_fix_screeninfo *fix = &m2info->fbcon.fix; - strcpy(fix->id, "MATROX DH"); + strscpy(fix->id, "MATROX DH"); fix->smem_start = m2info->video.base; fix->smem_len = m2info->video.len_usable; -- 2.34.1