mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Luis Henriques <luis.henriques@canonical.com>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
	kernel-team@lists.ubuntu.com
Cc: "Ben Hutchings" <ben@decadent.org.uk>,
	"David S. Miller" <davem@davemloft.net>,
	"Moritz Mühlenhoff" <jmm@inutil.org>,
	"Luis Henriques" <luis.henriques@canonical.com>
Subject: [PATCH 3.16.y-ckt 89/94] ppp, slip: Validate VJ compression slot parameters completely
Date: Fri, 13 Nov 2015 10:10:23 +0000	[thread overview]
Message-ID: <1447409428-12178-90-git-send-email-luis.henriques@canonical.com> (raw)
In-Reply-To: <1447409428-12178-1-git-send-email-luis.henriques@canonical.com>

3.16.7-ckt20 -stable review patch.  If anyone has any objections, please let me know.

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

From: Ben Hutchings <ben@decadent.org.uk>

commit 4ab42d78e37a294ac7bc56901d563c642e03c4ae upstream.

Currently slhc_init() treats out-of-range values of rslots and tslots
as equivalent to 0, except that if tslots is too large it will
dereference a null pointer (CVE-2015-7799).

Add a range-check at the top of the function and make it return an
ERR_PTR() on error instead of NULL.  Change the callers accordingly.

Compile-tested only.

Reported-by: 郭永刚 <guoyonggang@360.cn>
References: http://article.gmane.org/gmane.comp.security.oss.general/17908
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Moritz Mühlenhoff <jmm@inutil.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 drivers/isdn/i4l/isdn_ppp.c   | 10 ++++------
 drivers/net/ppp/ppp_generic.c |  6 ++----
 drivers/net/slip/slhc.c       | 12 ++++++++----
 drivers/net/slip/slip.c       |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 29d1cc0b2bc4..1025ef1a3988 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -322,9 +322,9 @@ isdn_ppp_open(int min, struct file *file)
 	 * VJ header compression init
 	 */
 	is->slcomp = slhc_init(16, 16);	/* not necessary for 2. link in bundle */
-	if (!is->slcomp) {
+	if (IS_ERR(is->slcomp)) {
 		isdn_ppp_ccp_reset_free(is);
-		return -ENOMEM;
+		return PTR_ERR(is->slcomp);
 	}
 #endif
 #ifdef CONFIG_IPPP_FILTER
@@ -573,10 +573,8 @@ isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg)
 			is->maxcid = val;
 #ifdef CONFIG_ISDN_PPP_VJ
 			sltmp = slhc_init(16, val);
-			if (!sltmp) {
-				printk(KERN_ERR "ippp, can't realloc slhc struct\n");
-				return -ENOMEM;
-			}
+			if (IS_ERR(sltmp))
+				return PTR_ERR(sltmp);
 			if (is->slcomp)
 				slhc_free(is->slcomp);
 			is->slcomp = sltmp;
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index dbf56debb7e3..65edd34654ee 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -709,10 +709,8 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 			val &= 0xffff;
 		}
 		vj = slhc_init(val2+1, val+1);
-		if (!vj) {
-			netdev_err(ppp->dev,
-				   "PPP: no memory (VJ compressor)\n");
-			err = -ENOMEM;
+		if (IS_ERR(vj)) {
+			err = PTR_ERR(vj);
 			break;
 		}
 		ppp_lock(ppp);
diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
index 1252d9c726a7..b52eabc168a0 100644
--- a/drivers/net/slip/slhc.c
+++ b/drivers/net/slip/slhc.c
@@ -84,8 +84,9 @@ static long decode(unsigned char **cpp);
 static unsigned char * put16(unsigned char *cp, unsigned short x);
 static unsigned short pull16(unsigned char **cpp);
 
-/* Initialize compression data structure
+/* Allocate compression data structure
  *	slots must be in range 0 to 255 (zero meaning no compression)
+ * Returns pointer to structure or ERR_PTR() on error.
  */
 struct slcompress *
 slhc_init(int rslots, int tslots)
@@ -94,11 +95,14 @@ slhc_init(int rslots, int tslots)
 	register struct cstate *ts;
 	struct slcompress *comp;
 
+	if (rslots < 0 || rslots > 255 || tslots < 0 || tslots > 255)
+		return ERR_PTR(-EINVAL);
+
 	comp = kzalloc(sizeof(struct slcompress), GFP_KERNEL);
 	if (! comp)
 		goto out_fail;
 
-	if ( rslots > 0  &&  rslots < 256 ) {
+	if (rslots > 0) {
 		size_t rsize = rslots * sizeof(struct cstate);
 		comp->rstate = kzalloc(rsize, GFP_KERNEL);
 		if (! comp->rstate)
@@ -106,7 +110,7 @@ slhc_init(int rslots, int tslots)
 		comp->rslot_limit = rslots - 1;
 	}
 
-	if ( tslots > 0  &&  tslots < 256 ) {
+	if (tslots > 0) {
 		size_t tsize = tslots * sizeof(struct cstate);
 		comp->tstate = kzalloc(tsize, GFP_KERNEL);
 		if (! comp->tstate)
@@ -141,7 +145,7 @@ out_free2:
 out_free:
 	kfree(comp);
 out_fail:
-	return NULL;
+	return ERR_PTR(-ENOMEM);
 }
 
 
diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c
index 87526443841f..0641fccdc954 100644
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -164,7 +164,7 @@ static int sl_alloc_bufs(struct slip *sl, int mtu)
 	if (cbuff == NULL)
 		goto err_exit;
 	slcomp = slhc_init(16, 16);
-	if (slcomp == NULL)
+	if (IS_ERR(slcomp))
 		goto err_exit;
 #endif
 	spin_lock_bh(&sl->lock);

  parent reply	other threads:[~2015-11-13 10:15 UTC|newest]

Thread overview: 97+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-13 10:08 [3.16.y-ckt stable] Linux 3.16.7-ckt20 stable review Luis Henriques
2015-11-13 10:08 ` [PATCH 3.16.y-ckt 01/94] regmap: debugfs: Ensure we don't underflow when printing access masks Luis Henriques
2015-11-13 10:08 ` [PATCH 3.16.y-ckt 02/94] regmap: debugfs: Don't bother actually printing when calculating max length Luis Henriques
2015-11-13 10:08 ` [PATCH 3.16.y-ckt 03/94] x86/xen: Support kexec/kdump in HVM guests by doing a soft reset Luis Henriques
2015-11-13 10:08 ` [PATCH 3.16.y-ckt 04/94] s390/boot/decompression: disable floating point in decompressor Luis Henriques
2015-11-13 10:08 ` [PATCH 3.16.y-ckt 05/94] svcrdma: handle rdma read with a non-zero initial page offset Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 06/94] dm: fix AB-BA deadlock in __dm_destroy() Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 07/94] [SMB3] Do not fall back to SMBWriteX in set_file_size error cases Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 08/94] clk: ti: fix dual-registration of uart4_ick Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 09/94] ASoC: dwc: correct irq clear method Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 10/94] dm raid: fix round up of default region size Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 11/94] ALSA: hda: Add dock support for ThinkPad T550 Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 12/94] ALSA: hda - Apply SPDIF pin ctl to MacBookPro 12,1 Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 13/94] USB: Add reset-resume quirk for two Plantronics usb headphones Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 14/94] usb: Add device quirk for Logitech PTZ cameras Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 15/94] staging: speakup: fix speakup-r regression Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 16/94] ALSA: synth: Fix conflicting OSS device registration on AWE32 Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 17/94] arm64: readahead: fault retry breaks mmap file read random detection Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 18/94] sched/core: Fix TASK_DEAD race in finish_task_switch() Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 19/94] dm cache: fix NULL pointer when switching from cleaner policy Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 20/94] 3w-9xxx: don't unmap bounce buffered commands Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 21/94] workqueue: make sure delayed work run in local cpu Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 22/94] drm/radeon: add pm sysfs files late Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 23/94] drm/radeon: add quirk for MSI R7 370 Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 24/94] drm/radeon: add quirk for ASUS " Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 25/94] crypto: sparc - initialize blkcipher.ivsize Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 26/94] drm/nouveau/fbcon: take runpm reference when userspace has an open fd Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 27/94] arm64: errata: use KBUILD_CFLAGS_MODULE for erratum #843419 Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 28/94] crypto: ahash - ensure statesize is non-zero Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 29/94] dm thin: fix missing pool reference count decrement in pool_ctr error path Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 30/94] btrfs: check unsupported filters in balance arguments Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 31/94] btrfs: fix use after free iterating extrefs Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 32/94] i2c: rcar: enable RuntimePM before registering to the core Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 33/94] i2c: s3c2410: " Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 34/94] i2c: designware-platdrv: " Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 35/94] i2c: designware: Do not use parameters from ACPI on Dell Inspiron 7348 Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 36/94] btrfs: fix possible leak in btrfs_ioctl_balance() Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 37/94] drm: Reject DRI1 hw lock ioctl functions for kms drivers Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 38/94] usb: xhci: Add support for URB_ZERO_PACKET to bulk/sg transfers Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 39/94] rbd: fix double free on rbd_dev->header_name Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 40/94] ath9k: declare required extra tx headroom Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 41/94] iio: accel: sca3000: memory corruption in sca3000_read_first_n_hw_rb() Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 42/94] iwlwifi: dvm: fix D3 firmware PN programming Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 43/94] iwlwifi: mvm: " Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 44/94] iwlwifi: fix firmware filename for 3160 Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 45/94] iwlwifi: pci: add a few more PCI subvendor IDs for the 7265 series Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 46/94] ARM: orion: Fix DSA platform device after mvmdio conversion Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 47/94] xen-blkfront: check for null drvdata in blkback_changed (XenbusStateClosing) Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 48/94] iio: mxs-lradc: Fix temperature offset Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 49/94] ALSA: hda - Fix inverted internal mic on Lenovo G50-80 Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 50/94] drm/i915: Deny wrapping an userptr into a framebuffer Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 51/94] x86/efi: Fix multiple GOP device support Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 52/94] ASoC: Add info callback for SX_TLV controls Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 53/94] xhci: don't finish a TD if we get a short transfer event mid TD Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 54/94] xhci: handle no ping response error properly Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 55/94] xhci: Add spurious wakeup quirk for LynxPoint-LP controllers Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 56/94] ASoC: wm8904: Correct number of EQ registers Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 57/94] drm/nouveau/gem: return only valid domain when there's only one Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 58/94] powerpc/rtas: Validate rtas.entry before calling enter_rtas() Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 59/94] mm: make sendfile(2) killable Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 60/94] rbd: don't leak parent_spec in rbd_dev_probe_parent() Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 61/94] rbd: prevent kernel stack blow up on rbd map Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 62/94] dm btree remove: fix a bug when rebalancing nodes after removal Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 63/94] dm btree: fix leak of bufio-backed block in btree_split_beneath error path Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 64/94] IB/cm: Fix rb-tree duplicate free and use-after-free Luis Henriques
2015-11-13 10:09 ` [PATCH 3.16.y-ckt 65/94] iwlwifi: mvm: init card correctly on ctkill exit check Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 66/94] module: Fix locking in symbol_put_addr() Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 67/94] crypto: api - Only abort operations on fatal signal Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 68/94] md/raid1: submit_bio_wait() returns 0 on success Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 69/94] md/raid10: " Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 70/94] iommu/amd: Don't clear DTE flags when modifying it Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 71/94] i2c: mv64xxx: really allow I2C offloading Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 72/94] drm/radeon: don't try to recreate sysfs entries on resume Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 73/94] mvsas: Fix NULL pointer dereference in mvs_slot_task_free Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 74/94] Revert "ARM64: unwind: Fix PC calculation" Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 75/94] drm/radeon: Restore LCD backlight level on resume (>= R5xx) Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 76/94] drm/radeon: move bl encoder assignment into bl init Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 77/94] drm/radeon: fix dpms when driver backlight control is disabled Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 78/94] rbd: require stable pages if message data CRCs are enabled Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 79/94] md/raid5: fix locking in handle_stripe_clean_event() Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 80/94] Revert "md: allow a partially recovered device to be hot-added to an array." Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 81/94] ipv6: Fix IPsec pre-encap fragmentation check Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 82/94] ppp: fix pppoe_dev deletion condition in pppoe_release() Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 83/94] ipv6: gre: support SIT encapsulation Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 84/94] net/mlx4: Copy/set only sizeof struct mlx4_eqe bytes Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 85/94] serial: 8250_pci: Add support for 16 port Exar boards Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 86/94] serial: 8250_pci: Add support for 12 " Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 87/94] serial: 8250_pci: Correct uartclk for xr17v35x expansion chips Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 88/94] isdn_ppp: Add checks for allocation failure in isdn_ppp_open() Luis Henriques
2015-11-13 10:10 ` Luis Henriques [this message]
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 90/94] staging/dgnc: fix info leak in ioctl Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 91/94] power: bq24190_charger: suppress build warning Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 92/94] sfc: Fix memcpy() with const destination compiler warning Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 93/94] sched/preempt: Rename PREEMPT_CHECK_OFFSET to PREEMPT_DISABLE_OFFSET Luis Henriques
2015-11-13 10:10 ` [PATCH 3.16.y-ckt 94/94] sched/preempt: Fix cond_resched_lock() and cond_resched_softirq() Luis Henriques
2015-11-16 17:56 ` [3.16.y-ckt stable] Linux 3.16.7-ckt20 stable review Ben Hutchings
2015-11-16 21:55   ` Luis Henriques

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=1447409428-12178-90-git-send-email-luis.henriques@canonical.com \
    --to=luis.henriques@canonical.com \
    --cc=ben@decadent.org.uk \
    --cc=davem@davemloft.net \
    --cc=jmm@inutil.org \
    --cc=kernel-team@lists.ubuntu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.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®