public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Chris Wright <chrisw@sous-sol.org>
To: linux-kernel@vger.kernel.org, stable@kernel.org, torvalds@osdl.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>,
	Chris Wedgwood <reviews@ml.cw.f00f.org>,
	Michael Krufky <mkrufky@linuxtv.org>,
	akpm@osdl.org, alan@lxorguk.ukuu.org.uk, amirkin@openvz.org
Subject: [patch 20/24] skip data conversion in compat_sys_mount when data_page is NULL
Date: Thu, 14 Dec 2006 17:33:57 -0800	[thread overview]
Message-ID: <20061215013827.678257000@sous-sol.org> (raw)
In-Reply-To: 20061215013337.823935000@sous-sol.org

[-- Attachment #1: skip-data-conversion-in-compat_sys_mount-when-data_page-is-null.patch --]
[-- Type: text/plain, Size: 2789 bytes --]

2.6.18-stable review patch.  If anyone has any objections, please let us know.
------------------

From: Andrey Mirkin <amirkin@openvz.org>

OpenVZ Linux kernel team has found a problem with mounting in compat mode.

Simple command "mount -t smbfs ..." on Fedora Core 5 distro in 32-bit mode
leads to oops:

Unable to handle kernel NULL pointer dereference at 0000000000000000 RIP:
[<ffffffff802bc7c6>] compat_sys_mount+0xd6/0x290
PGD 34d48067 PUD 34d03067 PMD 0
Oops: 0000 [1] SMP
CPU: 0
Modules linked in: iptable_nat simfs smbfs ip_nat ip_conntrack vzdquota
parport_pc lp parport 8021q bridge llc vznetdev vzmon nfs lockd sunrpc vzdev
iptable_filter af_packet xt_length ipt_ttl xt_tcpmss ipt_TCPMSS
iptable_mangle xt_limit ipt_tos ipt_REJECT ip_tables x_tables thermal
processor fan button battery asus_acpi ac uhci_hcd ehci_hcd usbcore i2c_i801
i2c_core e100 mii floppy ide_cd cdrom
Pid: 14656, comm: mount
RIP: 0060:[<ffffffff802bc7c6>]  [<ffffffff802bc7c6>]
compat_sys_mount+0xd6/0x290
RSP: 0000:ffff810034d31f38  EFLAGS: 00010292
RAX: 000000000000002c RBX: 0000000000000000 RCX: 0000000000000000
RDX: ffff810034c86bc0 RSI: 0000000000000096 RDI: ffffffff8061fc90
RBP: ffff810034d31f78 R08: 0000000000000000 R09: 000000000000000d
R10: ffff810034d31e58 R11: 0000000000000001 R12: ffff810039dc3000
R13: 000000000805ea48 R14: 0000000000000000 R15: 00000000c0ed0000
FS:  0000000000000000(0000) GS:ffffffff80749000(0033) knlGS:00000000b7d556b0
CS:  0060 DS: 007b ES: 007b CR0: 000000008005003b
CR2: 0000000000000000 CR3: 0000000034d43000 CR4: 00000000000006e0
Process mount (pid: 14656, veid=300, threadinfo ffff810034d30000, task
ffff810034c86bc0)
Stack:  0000000000000000 ffff810034dd0000 ffff810034e4a000 000000000805ea48
 0000000000000000 0000000000000000 0000000000000000 0000000000000000
 000000000805ea48 ffffffff8021e64e 0000000000000000 0000000000000000
Call Trace:
 [<ffffffff8021e64e>] ia32_sysret+0x0/0xa

Code: 83 3b 06 0f 85 41 01 00 00 0f b7 43 0c 89 43 14 0f b7 43 0a
RIP  [<ffffffff802bc7c6>] compat_sys_mount+0xd6/0x290
 RSP <ffff810034d31f38>
CR2: 0000000000000000

The problem is that data_page pointer can be NULL, so we should skip data
conversion in this case.

Signed-off-by: Andrey Mirkin <amirkin@openvz.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---

 fs/compat.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.18.5.orig/fs/compat.c
+++ linux-2.6.18.5/fs/compat.c
@@ -873,7 +873,7 @@ asmlinkage long compat_sys_mount(char __
 
 	retval = -EINVAL;
 
-	if (type_page) {
+	if (type_page && data_page) {
 		if (!strcmp((char *)type_page, SMBFS_NAME)) {
 			do_smb_super_data_conv((void *)data_page);
 		} else if (!strcmp((char *)type_page, NCPFS_NAME)) {

--

  parent reply	other threads:[~2006-12-15  1:35 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-15  1:33 [patch 00/24] -stable review Chris Wright
2006-12-15  1:33 ` [patch 01/24] softmac: remove netif_tx_disable when scanning Chris Wright
2006-12-15  1:33 ` [patch 02/24] EBTABLES: Fix wraparounds in ebt_entries verification Chris Wright
2006-12-15  1:33 ` [patch 03/24] EBTABLES: Verify that ebt_entries have zero ->distinguisher Chris Wright
2006-12-15  1:33 ` [patch 04/24] EBTABLES: Deal with the worst-case behaviour in loop checks Chris Wright
2006-12-15  1:33 ` [patch 05/24] EBTABLES: Prevent wraparounds in checks for entry components sizes Chris Wright
2006-12-15  1:33 ` [patch 06/24] NET_SCHED: policer: restore compatibility with old iproute binaries Chris Wright
2006-12-15  1:33 ` [patch 07/24] dm crypt: Fix data corruption with dm-crypt over RAID5 Chris Wright
2006-12-15  1:33 ` [patch 08/24] NETFILTER: ip_tables: revision support for compat code Chris Wright
2006-12-15  1:33 ` [patch 09/24] PKT_SCHED act_gact: division by zero Chris Wright
2006-12-15  1:33 ` [patch 10/24] SUNHME: Fix for sunhme failures on x86 Chris Wright
2006-12-15  1:33 ` [patch 11/24] XFRM: Use output device disable_xfrm for forwarded packets Chris Wright
2006-12-15  1:33 ` [patch 12/24] dm snapshot: fix freeing pending exception Chris Wright
2006-12-15  1:33 ` [patch 13/24] IPSEC: Fix inetpeer leak in ipv4 xfrm dst entries Chris Wright
2006-12-15  1:33 ` [patch 14/24] IrDA: Incorrect TTP header reservation Chris Wright
2006-12-15  1:33 ` [patch 15/24] bonding: incorrect bonding state reported via ioctl Chris Wright
2006-12-15  1:33 ` [patch 16/24] DVB: lgdt330x: fix signal / lock status detection bug Chris Wright
2006-12-15  1:33 ` [patch 17/24] V4L: Fix broken TUNER_LG_NTSC_TAPE radio support Chris Wright
2006-12-15  1:33 ` [patch 18/24] ieee1394: ohci1394: add PPC_PMAC platform code to driver probe Chris Wright
2006-12-15  1:33 ` [patch 19/24] ARM: Add sys_*at syscalls Chris Wright
2006-12-15  1:33 ` Chris Wright [this message]
2006-12-15  1:33 ` [patch 21/24] softirq: remove BUG_ONs which can incorrectly trigger Chris Wright
2006-12-15  1:33 ` [patch 22/24] m32r: make userspace headers platform-independent Chris Wright
2006-12-15  1:34 ` [patch 23/24] forcedeth: Disable INTx when enabling MSI in forcedeth Chris Wright
2006-12-15  1:34 ` [patch 24/24] Bluetooth: Add packet size checks for CAPI messages (CVE-2006-6106) Chris Wright
2006-12-15  1:37 ` [patch 00/24] -stable review Chris Wright
2006-12-15 18:20 ` [patch 25/24] x86-64: Mark rdtsc as sync only for netburst, not for core2 Chris Wright

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=20061215013827.678257000@sous-sol.org \
    --to=chrisw@sous-sol.org \
    --cc=akpm@osdl.org \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=amirkin@openvz.org \
    --cc=chuckw@quantumlinux.com \
    --cc=davej@redhat.com \
    --cc=jmforbes@linuxtx.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mkrufky@linuxtv.org \
    --cc=rdunlap@xenotime.net \
    --cc=reviews@ml.cw.f00f.org \
    --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