mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
	akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk,
	Jan Engelhardt <jengelh@medozas.de>,
	Patrick McHardy <kaber@trash.net>
Subject: [patch 13/29] netfilter: nf_log: avoid oops in (un)bind with invalid nfproto values
Date: Thu, 10 Mar 2011 15:54:19 -0800	[thread overview]
Message-ID: <20110310235537.329438570@clark.kroah.org> (raw)
In-Reply-To: <20110310235548.GA10103@kroah.com>

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

------------------

From: Jan Engelhardt <jengelh@medozas.de>

commit 9ef0298a8e5730d9a46d640014c727f3b4152870 upstream.

Like many other places, we have to check that the array index is
within allowed limits, or otherwise, a kernel oops and other nastiness
can ensue when we access memory beyond the end of the array.

[ 5954.115381] BUG: unable to handle kernel paging request at 0000004000000000
[ 5954.120014] IP:  __find_logger+0x6f/0xa0
[ 5954.123979]  nf_log_bind_pf+0x2b/0x70
[ 5954.123979]  nfulnl_recv_config+0xc0/0x4a0 [nfnetlink_log]
[ 5954.123979]  nfnetlink_rcv_msg+0x12c/0x1b0 [nfnetlink]
...

The problem goes back to v2.6.30-rc1~1372~1342~31 where nf_log_bind
was decoupled from nf_log_register.

Reported-by: Miguel Di Ciurcio Filho <miguel.filho@gmail.com>,
  via irc.freenode.net/#netfilter
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 net/netfilter/nf_log.c |    4 ++++
 1 file changed, 4 insertions(+)

--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -85,6 +85,8 @@ EXPORT_SYMBOL(nf_log_unregister);
 
 int nf_log_bind_pf(u_int8_t pf, const struct nf_logger *logger)
 {
+	if (pf >= ARRAY_SIZE(nf_loggers))
+		return -EINVAL;
 	mutex_lock(&nf_log_mutex);
 	if (__find_logger(pf, logger->name) == NULL) {
 		mutex_unlock(&nf_log_mutex);
@@ -98,6 +100,8 @@ EXPORT_SYMBOL(nf_log_bind_pf);
 
 void nf_log_unbind_pf(u_int8_t pf)
 {
+	if (pf >= ARRAY_SIZE(nf_loggers))
+		return;
 	mutex_lock(&nf_log_mutex);
 	rcu_assign_pointer(nf_loggers[pf], NULL);
 	mutex_unlock(&nf_log_mutex);



  parent reply	other threads:[~2011-03-11  0:01 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-10 23:55 [patch 00/29] 2.6.37.4-stable review Greg KH
2011-03-10 23:54 ` [patch 01/29] cpuset: add a missing unlock in cpuset_write_resmask() Greg KH
2011-03-10 23:54 ` [patch 02/29] virtio: console: Dont access vqs if device was unplugged Greg KH
2011-03-10 23:54 ` [patch 03/29] [S390] keyboard: integer underflow bug Greg KH
2011-03-10 23:54 ` [patch 04/29] ASoC: Fix WM9081 platform data initialisation Greg KH
2011-03-10 23:54 ` [patch 05/29] ALSA: HDA: Realtek: Fixup jack detection to input subsystem Greg KH
2011-03-10 23:54 ` [patch 06/29] ALSA: hda - Dont set to D3 in Cirrus errata init verbs Greg KH
2011-03-10 23:54 ` [patch 07/29] drivers/misc/bmp085.c: add MODULE_DEVICE_TABLE Greg KH
2011-03-10 23:54 ` [patch 08/29] nfs4: Ensure that ACL pages sent over NFS were not allocated from the slab (v3) Greg KH
2011-03-10 23:54 ` [patch 09/29] RxRPC: Fix v1 keys Greg KH
2011-03-10 23:54 ` [patch 10/29] ath9k: Fix ath9k prevents CPU to enter C3 states Greg KH
2011-03-10 23:54 ` [patch 11/29] ixgbe: fix for 82599 erratum on Header Splitting Greg KH
2011-03-10 23:54 ` [patch 12/29] mm: fix possible cause of a page_mapped BUG Greg KH
2011-03-10 23:54 ` Greg KH [this message]
2011-03-10 23:54 ` [patch 14/29] [CPUFREQ] pcc-cpufreq: dont load driver if get_freq fails during init Greg KH
2011-03-10 23:54 ` [patch 15/29] nfsd: wrong index used in inner loop Greg KH
2011-03-10 23:54 ` [patch 16/29] HID: hid-mosart: ignore buttons report Greg KH
2011-03-10 23:54 ` [patch 17/29] NFS: NFSv4 readdir loses entries Greg KH
2011-03-10 23:54 ` [patch 18/29] ipvs: fix dst_lock locking on dest update Greg KH
2011-03-10 23:54 ` [patch 19/29] net: dont allow CAP_NET_ADMIN to load non-netdev kernel modules Greg KH
2011-03-10 23:54 ` [patch 20/29] netfilter: arpt_mangle: fix return values of checkentry Greg KH
2011-03-10 23:54 ` [patch 21/29] r8169: use RxFIFO overflow workaround for 8168c chipset Greg KH
2011-03-10 23:54 ` [patch 22/29] r8169: RxFIFO overflow oddities with 8168 chipsets Greg KH
2011-03-10 23:54 ` [patch 23/29] r8169: prevent RxFIFO induced loops in the irq handler Greg KH
2011-03-10 23:54 ` [patch 24/29] drivers/net: Call netif_carrier_off at the end of the probe Greg KH
2011-03-10 23:54 ` [patch 25/29] sched: Fix sched rt group scheduling when hierachy is enabled Greg KH
2011-03-10 23:54 ` [patch 26/29] [media] ivtv: Fix corrective action taken upon DMA ERR interrupt to avoid hang Greg KH
2011-03-10 23:54 ` [patch 27/29] [media] cx23885: Revert "Check for slave nack on all transactions" Greg KH
2011-03-10 23:54 ` [patch 28/29] [media] cx25840: fix probing of cx2583x chips Greg KH
2011-03-10 23:54 ` [patch 29/29] [media] DiB7000M: add pid filtering Greg KH
2011-03-11 15:02 ` [patch 00/29] 2.6.37.4-stable review Stefan Lippers-Hollmann
2011-03-11 15:46   ` 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=20110310235537.329438570@clark.kroah.org \
    --to=gregkh@suse.de \
    --cc=akpm@linux-foundation.org \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=jengelh@medozas.de \
    --cc=kaber@trash.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable-review@kernel.org \
    --cc=stable@kernel.org \
    --cc=torvalds@linux-foundation.org \
    /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

all inboxes | Powered by JetHome®