linux-kernel - Re: [PATCHv2 22/28] cxusb: treat firmware data as const

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1211727761.31212.120.camel@shinybook.infradead.org>
Date:	Sun, 25 May 2008 16:02:41 +0100
From:	David Woodhouse <dwmw2@...radead.org>
To:	Michael Krufky <mkrufky@...uxtv.org>
Cc:	linux-kernel@...r.kernel.org, sam@...nborg.org,
	alan@...rguk.ukuu.org.uk, akpm@...ux-foundation.org,
	Patrick Boettcher <patrick.boettcher@...y.de>,
	Chris Pascoe <c.pascoe@...e.uq.edu.au>
Subject: Re: [PATCHv2 22/28] cxusb: treat firmware data as const

On Sun, 2008-05-25 at 10:14 -0400, Michael Krufky wrote:
> It's broken...  Please see fix, below:

commit e6983a70abb3e6d7a0d711176c89113c81f2ead6
Author: David Woodhouse <dwmw2@...radead.org>
Date:   Sat May 24 00:12:42 2008 +0100

    cxusb: treat firmware data as const
    
    ...which means allocating our own copy when we want to modify it.
    
    (stupid thinko fixed by mkrufky)
    
    Signed-off-by: David Woodhouse <dwmw2@...radead.org>
    Signed-off-by: Michael Krufky <mkrufky@...uxtv.org>

diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 720fcd1..0286156 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -24,6 +24,7 @@
  * see Documentation/dvb/README.dvb-usb for more information
  */
 #include <media/tuner.h>
+#include <linux/vmalloc.h>
 
 #include "cxusb.h"
 
@@ -700,12 +701,26 @@ static int bluebird_patch_dvico_firmware_download(struct usb_device *udev,
 
 		if (fw->data[idoff] == (USB_VID_DVICO & 0xff) &&
 		    fw->data[idoff + 1] == USB_VID_DVICO >> 8) {
-			fw->data[idoff + 2] =
+			struct firmware new_fw;
+			u8 *new_fw_data = vmalloc(fw->size);
+			int ret;
+
+			if (!new_fw_data)
+				return -ENOMEM;
+
+			memcpy(new_fw_data, fw->data, fw->size);
+			new_fw.size = fw->size;
+			new_fw.data = new_fw_data;
+
+			new_fw_data[idoff + 2] =
 				le16_to_cpu(udev->descriptor.idProduct) + 1;
-			fw->data[idoff + 3] =
+			new_fw_data[idoff + 3] =
 				le16_to_cpu(udev->descriptor.idProduct) >> 8;
 
-			return usb_cypress_load_firmware(udev, fw, CYPRESS_FX2);
+			ret = usb_cypress_load_firmware(udev, &new_fw,
+							CYPRESS_FX2);
+			vfree(new_fw_data);
+			return ret;
 		}
 	}
 

-- 
dwmw2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/