diff --git a/[refs] b/[refs]
index 11e1654ca37c..40d8a675d4f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e076c92ed6908b0a06ea0d419606a59cae7febe6
+refs/heads/master: bcd2ebb76039bf4b1d1cb9f9f0e182548578e692
diff --git a/trunk/drivers/media/dvb/frontends/drxk_hard.c b/trunk/drivers/media/dvb/frontends/drxk_hard.c
index c4b35a5638cd..89db37835872 100644
--- a/trunk/drivers/media/dvb/frontends/drxk_hard.c
+++ b/trunk/drivers/media/dvb/frontends/drxk_hard.c
@@ -1388,6 +1388,12 @@ static int DownloadMicrocode(struct drxk_state *state,
 		BlockCRC = (pSrc[0] << 8) | pSrc[1];
 		pSrc += sizeof(u16);
 		offset += sizeof(u16);
+
+		if (offset + BlockSize > Length) {
+			printk(KERN_ERR "drxk: Firmware is corrupted.\n");
+			return -EINVAL;
+		}
+
 		status = write_block(state, Address, BlockSize, pSrc);
 		if (status < 0)
 			break;