r2382 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[Andres Salomon]

Author: dilinger-guest
Date: 2005-01-23 22:26:18 +0100 (Sun, 23 Jan 2005)
New Revision: 2382

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-ioctl.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-13
Log:
  * scsi-ioctl.dpatch
    Provide a warning about unknown opcodes (Andres Salomon).


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-01-23 21:21:39 UTC (rev 2381)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-01-23 21:26:18 UTC (rev 2382)
@@ -37,6 +37,9 @@
 
   * Drop sata-nv-fix backport (Andres Salomon).
 
+  * scsi-ioctl.dpatch
+    Provide a warning about unknown opcodes (Andres Salomon).
+
  -- Simon Horman <horms@debian.org>  Fri, 21 Jan 2005 12:38:06 +0900
 
 kernel-source-2.6.8 (2.6.8-12) unstable; urgency=high

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-ioctl.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-ioctl.dpatch	2005-01-23 21:21:39 UTC (rev 2381)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-ioctl.dpatch	2005-01-23 21:26:18 UTC (rev 2382)
@@ -0,0 +1,26 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH]  scsi_ioctl: only warn about really unknown opcodes
+## DP: Patch author: torvalds
+## DP: Upstream status: backport
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# Backported from 2.6.11-rcX by Andres Salomon.
+--- orig/drivers/block/scsi_ioctl.c	2005-01-23 16:17:42.000000000 -0500
++++ mod/drivers/block/scsi_ioctl.c	2005-01-23 16:18:43.000000000 -0500
+@@ -197,6 +197,11 @@
+ 			return 0;
+ 	}
+ 
++	if (!type) {
++		cmd_type[cmd[0]] = CMD_WARNED;
++		printk(KERN_WARNING "scsi: unknown opcode 0x%02x\n", cmd[0]);
++	}
++
+ 	/* And root can do any command.. */
+ 	if (capable(CAP_SYS_RAWIO))
+ 		return 0;

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-13
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-13	2005-01-23 21:21:39 UTC (rev 2381)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-13	2005-01-23 21:26:18 UTC (rev 2382)
@@ -7,3 +7,4 @@
 + cmsg-compat-signedness-fix-fix.dpatch
 + fs-partitions-efi-update.dpatch
 + amd64-quotactl.dpatch
++ scsi-ioctl.dpatch