From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Randy Dunlap <rdunlap@xenotime.net>,
Dave Jones <davej@redhat.com>,
Chuck Wolber <chuckw@quantumlinux.com>,
torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk,
mike.miller@hp.com, axboe@suse.de
Subject: [patch 25/26] cciss: bug fix for BIG_PASS_THRU
Date: Tue, 13 Dec 2005 00:23:59 -0800 [thread overview]
Message-ID: <20051213082359.GZ5823@kroah.com> (raw)
In-Reply-To: <20051213082143.GA5823@kroah.com>
[-- Attachment #1: cciss-bug-fix-for-big_pass_thru.patch --]
[-- Type: text/plain, Size: 1206 bytes --]
-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jens Axboe <axboe@suse.de>
Applications using CCISS_BIG_PASSTHRU complained that the data written
was zeros. The problem is that the buffer is being cleared after the
user copy, unless the user copy has failed... Correct that logic.
Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index e239a6c..33f8341 100644
---
drivers/block/cciss.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--- linux-2.6.14.3.orig/drivers/block/cciss.c
+++ linux-2.6.14.3/drivers/block/cciss.c
@@ -1016,10 +1016,11 @@ static int cciss_ioctl(struct inode *ino
status = -ENOMEM;
goto cleanup1;
}
- if (ioc->Request.Type.Direction == XFER_WRITE &&
- copy_from_user(buff[sg_used], data_ptr, sz)) {
+ if (ioc->Request.Type.Direction == XFER_WRITE) {
+ if (copy_from_user(buff[sg_used], data_ptr, sz)) {
status = -ENOMEM;
- goto cleanup1;
+ goto cleanup1;
+ }
} else {
memset(buff[sg_used], 0, sz);
}
--
next prev parent reply other threads:[~2005-12-13 8:24 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20051213073430.558435000@press.kroah.org>
2005-12-13 8:21 ` [patch 00/26] - stable review Greg KH
2005-12-13 8:22 ` [patch 01/26] drivers/scsi/dpt_i2o.c: fix a user-after-free Greg KH
2005-12-13 8:22 ` [patch 02/26] drivers/message/i2o/pci.c: fix a use-after-free Greg KH
2005-12-13 8:22 ` [patch 03/26] drivers/infiniband/core/mad.c: " Greg KH
2005-12-13 8:22 ` [patch 04/26] Fix crash when ptrace poking hugepage areas Greg KH
2005-12-13 8:22 ` [patch 05/26] USB: Adapt microtek driver to new scsi features Greg KH
2005-12-13 8:22 ` [patch 06/26] setkeys needs root Greg KH
2005-12-13 8:22 ` [patch 07/26] [NETLINK]: Fix processing of fib_lookup netlink messages Greg KH
2005-12-13 8:22 ` [patch 08/26] Fix listxattr() for generic security attributes Greg KH
2005-12-13 8:22 ` [patch 09/26] DVB: BUDGET CI card depends on STV0297 demodulator Greg KH
2005-12-13 15:50 ` Daniel Drake
2005-12-13 18:12 ` [stable] " Greg KH
2005-12-13 8:22 ` [patch 10/26] ACPI: Prefer _CST over FADT for C-state capabilities Greg KH
2005-12-13 16:00 ` Daniel Drake
2005-12-13 18:11 ` [stable] " Greg KH
2005-12-13 8:22 ` [patch 11/26] ACPI: fix HP nx8220 boot hang regression Greg KH
2005-12-13 8:22 ` [patch 12/26] ACPI: Add support for FADT P_LVL2_UP flag Greg KH
2005-12-13 8:23 ` [patch 13/26] 32bit integer overflow in invalidate_inode_pages2() Greg KH
2005-12-13 8:23 ` [patch 14/26] V4L/DVB (3135) Fix tuner init for Pinnacle PCTV Stereo Greg KH
2005-12-13 8:23 ` [patch 15/26] V4L/DVB: Fix analog NTSC for Thomson DTT 761X hybrid tuner Greg KH
2005-12-13 8:23 ` [patch 17/26] i82365: release all resources if no devices are found Greg KH
2005-12-13 8:23 ` [patch 18/26] [AGPGART] Fix serverworks TLB flush Greg KH
2005-12-13 8:23 ` [patch 19/26] bonding: fix feature consolidation Greg KH
2005-12-13 8:23 ` [patch 20/26] [BRIDGE]: recompute features when adding a new device Greg KH
2005-12-13 8:23 ` [patch 16/26] [ALSA] nm256: reset workaround for Latitude CSx Greg KH
2005-12-13 8:23 ` [patch 21/26] [libata] locking rewrite (== fix) Greg KH
2005-12-13 8:23 ` [patch 22/26] I8K: fix /proc reporting of blank service tags Greg KH
2005-12-13 8:23 ` [patch 23/26] ide-floppy: software eject not working with LS-120 drive Greg KH
2005-12-13 8:23 ` [patch 24/26] - stable review cciss: bug fix for hpacucli Greg KH
2005-12-13 8:23 ` Greg KH [this message]
2005-12-13 8:24 ` [patch 26/26] Add try_to_freeze to kauditd Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051213082359.GZ5823@kroah.com \
--to=gregkh@suse.de \
--cc=akpm@osdl.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=axboe@suse.de \
--cc=chuckw@quantumlinux.com \
--cc=davej@redhat.com \
--cc=jmforbes@linuxtx.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mike.miller@hp.com \
--cc=rdunlap@xenotime.net \
--cc=stable@kernel.org \
--cc=torvalds@osdl.org \
--cc=tytso@mit.edu \
--cc=zwane@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox