diff mbox

[for,stable] cx25821: Remove bad strcpy to read-only char*

Message ID CALF0-+Unvjo_SZom-x2b7X0kLg90GHeiQhXpQPh58fA=Dj5gpQ@mail.gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ezequiel Garcia July 24, 2012, 4:59 p.m. UTC 
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 <elezegarcia@gmail.com>
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 <radek@masin.eu>
Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
---
 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

Comments

Ben Hutchings July 30, 2012, 1:56 a.m. UTC | #1 
On Tue, 2012-07-24 at 13:59 -0300, Ezequiel Garcia wrote:
> 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.
[...]

An upstream commit hash would have helped, but I found it anyway.
Queued up for 3.2.y.

Ben.
Ezequiel Garcia July 30, 2012, 12:12 p.m. UTC | #2 
Hi Ben,

On Sun, Jul 29, 2012 at 10:56 PM, Ben Hutchings <ben@decadent.org.uk> wrote:

>>
>> If I'm doing anything wrong, just yell at me.
> [...]
>
> An upstream commit hash would have helped, but I found it anyway.
> Queued up for 3.2.y.
>

Thanks for the hint and sorry for the trouble...
Ezequiel.
--
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 mbox

Patch

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;