From patchwork Wed Jul 18 17:41:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 1212671 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 E8A3A3FD4F for ; Wed, 18 Jul 2012 17:41:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751746Ab2GRRlW (ORCPT ); Wed, 18 Jul 2012 13:41:22 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:46120 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750857Ab2GRRlW (ORCPT ); Wed, 18 Jul 2012 13:41:22 -0400 Received: by yenl2 with SMTP id l2so1843514yen.19 for ; Wed, 18 Jul 2012 10:41:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=YMJjBh6GxTJ1Cr3rl2bfa4+ouJjfbuuskBWeeCHHsa8=; b=YnfjrCVgKQdLFHKD/9Cr8POW2akK7QKDbLYHg8+hoMVrF5HiwCqLS09RPFkxbkT9Wi vmZbiZjVk8f933Ge+VF/8xjt0BKYZZxEqhJ02hiihngFoB+EAJborBt5Z8AL2hJnfgGJ LVZGiT4FusbMXs+Q0XJ6SDDGTmuRCzb+nq84+dcjdk3q2QTuMhbC44X6qgjCRmDpKU0f B2NkGN5WdiNRRmkT4uwBiZu4PSeoEk/Qtjpi3+pp/wJq/LAE6TVE+gXvJjNqYC96uW20 yGZekju33H6h/PG8oEb5MD/UcKG81u1UWhjHlf0kuQt0/MReZVlwf8mPhHeoGkscTBkP Bcyw== Received: by 10.236.77.39 with SMTP id c27mr1654248yhe.99.1342633280439; Wed, 18 Jul 2012 10:41:20 -0700 (PDT) Received: from localhost.localdomain ([186.153.120.250]) by mx.google.com with ESMTPS id i34sm1526593anm.12.2012.07.18.10.41.17 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 18 Jul 2012 10:41:19 -0700 (PDT) From: Ezequiel Garcia To: Mauro Carvalho Chehab Cc: , Ezequiel Garcia Subject: [PATCH] cx25821: Remove bad strcpy to read-only char* Date: Wed, 18 Jul 2012 14:41:11 -0300 Message-Id: <1342633271-5731-1-git-send-email-elezegarcia@gmail.com> X-Mailer: git-send-email 1.7.4.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The strcpy was being used to set the name of the board. This was both wrong and redundant, since the destination char* was read-only and the name is set statically at compile time. The type of the name field is changed to const char* to prevent future errors. Reported-by: Radek Masin Signed-off-by: Ezequiel Garcia --- Hi Mauro, I believe without this patch cx25821 driver is completely unusable. So perhaps this patch should also go to stable tree? I'm a bit unsure about this procedure. Regards, Ezequiel. --- drivers/media/video/cx25821/cx25821-core.c | 3 --- drivers/media/video/cx25821/cx25821.h | 2 +- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/drivers/media/video/cx25821/cx25821-core.c b/drivers/media/video/cx25821/cx25821-core.c index 83c1aa6..f11f6f0 100644 --- a/drivers/media/video/cx25821/cx25821-core.c +++ b/drivers/media/video/cx25821/cx25821-core.c @@ -904,9 +904,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;