From patchwork Tue Jul 24 16:59:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 1232651 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D31403FD4F for ; Tue, 24 Jul 2012 16:59:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755799Ab2GXQ7Y (ORCPT ); Tue, 24 Jul 2012 12:59:24 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:51827 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755615Ab2GXQ7X (ORCPT ); Tue, 24 Jul 2012 12:59:23 -0400 Received: by gglu4 with SMTP id u4so6888560ggl.19 for ; Tue, 24 Jul 2012 09:59:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=wB2tB9/O4VskzpD6J21kfHR4JhfxL9lm+Wh4D09tou0=; b=E6MHPfxYFpjWXUz/91WfaUkQI1OUs55+gvHdVrk2KtL8hP++mNsyDhpzjGeH6eVQkC cl77J864NFu/gj1mOUsegj+COzxHwdrsnIKWTWSha+L+y0Apc7I5IrkTsfZ+U0yb/vrZ AqEbHWFMEZwHBGHr+ZQVqvhNUHJsVJyIRDYxiynWhsHFaLiKfgLDzpFhRjt9hHrjmhHf y6xe/cq6m7LlyU26KQzRheH919oIT1uBdNAGFaX1ynzSV6ZR4qXKztUcUNqKXTcU0SCm yryKhkzFTREMPy89haYFLcaIXnhlzMPFqqetDGSJkxexB3McueM49m/XW0lzwAFKLiqO Uf3w== MIME-Version: 1.0 Received: by 10.42.154.69 with SMTP id p5mr16731607icw.4.1343149162354; Tue, 24 Jul 2012 09:59:22 -0700 (PDT) Received: by 10.64.55.162 with HTTP; Tue, 24 Jul 2012 09:59:22 -0700 (PDT) In-Reply-To: References: Date: Tue, 24 Jul 2012 13:59:22 -0300 Message-ID: Subject: [PATCH for stable] cx25821: Remove bad strcpy to read-only char* From: Ezequiel Garcia To: gregkh Cc: stable , Mauro Carvalho Chehab , Hans Verkuil , linux-media , linux-kernel@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Greg, This patch is already in Linus' tree and I really think it should go into stable as well. You will find this bug in every kernel from the moment cx25821 went out of staging. I just read Documentation/stable_kernel_rules.txt, so I guess it was enough to add a tag "Cc: stable@vger.kernel.org" in the patch (right?). Now I know it :-) If I'm doing anything wrong, just yell at me. Thanks, Ezequiel. From 1859521e76226687e79e1452b040fd3e02c469d8 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Wed, 18 Jul 2012 10:05:26 -0300 Subject: [PATCH] cx25821: Remove bad strcpy to read-only char* The strcpy was being used to set the name of the board. Since the destination char* was read-only and the name is set statically at compile time; this was both wrong and redundant. The type of char* is changed to const char* to prevent future errors. Reported-by: Radek Masin Signed-off-by: Ezequiel Garcia --- drivers/media/video/cx25821/cx25821-core.c | 3 --- drivers/media/video/cx25821/cx25821.h | 2 +- 2 files changed, 1 insertions(+), 4 deletions(-) -- 1.7.8.6 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/video/cx25821/cx25821-core.c b/drivers/media/video/cx25821/cx25821-core.c index 7930ca5..235bf7d 100644 --- a/drivers/media/video/cx25821/cx25821-core.c +++ b/drivers/media/video/cx25821/cx25821-core.c @@ -912,9 +912,6 @@ static int cx25821_dev_setup(struct cx25821_dev *dev) list_add_tail(&dev->devlist, &cx25821_devlist); mutex_unlock(&cx25821_devlist_mutex); - strcpy(cx25821_boards[UNKNOWN_BOARD].name, "unknown"); - strcpy(cx25821_boards[CX25821_BOARD].name, "cx25821"); - if (dev->pci->device != 0x8210) { pr_info("%s(): Exiting. Incorrect Hardware device = 0x%02x\n", __func__, dev->pci->device); diff --git a/drivers/media/video/cx25821/cx25821.h b/drivers/media/video/cx25821/cx25821.h index b9aa801..029f293 100644 --- a/drivers/media/video/cx25821/cx25821.h +++ b/drivers/media/video/cx25821/cx25821.h @@ -187,7 +187,7 @@ enum port { }; struct cx25821_board { - char *name; + const char *name; enum port porta; enum port portb; enum port portc;