From patchwork Thu Jul 19 13:44:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 1216871 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id CFC25DF24C for ; Thu, 19 Jul 2012 13:44:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751273Ab2GSNoV (ORCPT ); Thu, 19 Jul 2012 09:44:21 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:45724 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751185Ab2GSNoU (ORCPT ); Thu, 19 Jul 2012 09:44:20 -0400 Received: by yenl2 with SMTP id l2so2761884yen.19 for ; Thu, 19 Jul 2012 06:44:19 -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=gWKUxSB2h9mAbz+FRrmR0IxuXoyT69kJZp26GLOcio0=; b=lbt7HfwMffC1UmijiToueVkdQgzzjOmLihPIcBE6D3IyMqCOiB5FeMbLCLxoB8u9B/ LpeIiZBjthIANlU8y5WnVtLpvRyuhwSYjJ5xz99S+uwd6xbHaFvIhv1ihFWz3itcfNzu iiYRWoxtX+S107eDktEo7aKj5bmNCtE+pU+RiVx8d6ahSESkMHZLsGk00CzP4XTR0qga DVh6DyhSWyVblt9TdEif+PuUgmfWUPobudMRTJMQ+WIn87k7qHEEbp/dJHGGimc8peDV bJiglhhpez+0LEgNtYK6bBgoWpbNJaERpNwpkTWQxW3K/VPR1MHpR0ikiN/WsfFkMUNX NU8w== MIME-Version: 1.0 Received: by 10.50.36.227 with SMTP id t3mr1554500igj.13.1342705459652; Thu, 19 Jul 2012 06:44:19 -0700 (PDT) Received: by 10.64.55.162 with HTTP; Thu, 19 Jul 2012 06:44:19 -0700 (PDT) In-Reply-To: References: Date: Thu, 19 Jul 2012 10:44:19 -0300 Message-ID: Subject: [PATCH for v3.5] cx25821: Remove bad strcpy to read-only char* From: Ezequiel Garcia To: torvalds@linux-foundation.org Cc: linux-media , linux-kernel@vger.kernel.org, Mauro Carvalho Chehab , Hans Verkuil Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Linus, I'm sending the attached patch directly to you for inclusion in 3.5 as without it the cx25821 driver will panic on probe. It looks like this bug has been around since cx25821 was first mainlined, so it could make sense to consider its inclusion in stable also. Since Mauro is still on vacation, I'm sending directly to you so this can be merged for 3.5 before it is released. 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;