From c65c4f4ff2c601919d6843e6af48d07baf7a1297 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 24 May 2010 14:33:53 -0700 Subject: [PATCH] --- yaml --- r: 198335 b: refs/heads/master c: dbd536bf2f1b494240b56035ee16eba2e3d89b6a h: refs/heads/master i: 198333: 3d921ad2fb98e17f9e09448e613cb07e465a4229 198331: 21967eba3d40211c60fd2cf2e695c085eb024ce4 198327: 14a943566af9dc89dc878983cb9ab906fed95638 198319: 7d403f2e1cfbec712b832e8f6e285a3ccf613c26 198303: 72850b246c64df3552729f264330dd47382fea12 198271: 31a480c05df43b33dfe4a734a3dd0dccb0edaa01 v: v3 --- [refs] | 2 +- trunk/drivers/video/sis/sis_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index afe3f24d3c0d..b03fa94efd9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fbd65e0ecdeffe5e50ad850fb7240888b1af6b22 +refs/heads/master: dbd536bf2f1b494240b56035ee16eba2e3d89b6a diff --git a/trunk/drivers/video/sis/sis_main.c b/trunk/drivers/video/sis/sis_main.c index a531a0f7cdf2..559bf1727a2b 100644 --- a/trunk/drivers/video/sis/sis_main.c +++ b/trunk/drivers/video/sis/sis_main.c @@ -1845,7 +1845,7 @@ sisfb_get_fix(struct fb_fix_screeninfo *fix, int con, struct fb_info *info) memset(fix, 0, sizeof(struct fb_fix_screeninfo)); - strcpy(fix->id, ivideo->myid); + strlcpy(fix->id, ivideo->myid, sizeof(fix->id)); mutex_lock(&info->mm_lock); fix->smem_start = ivideo->video_base + ivideo->video_offset;