From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3039319-1523471888-2-10577350106251738029 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523471887; b=rfNQxO5y05KOItHDgnQgwMz1VK0jnuy0WfPkz9oVeDvd/sI6BU F5VuyaeDXrEPa+84oqFT5n4sfGSur/vJ3Fjsbo6+uCAg+XaqPt6vkW9Z/nkhpNtE zQgEAWOmfgknpZfhZPARcfo6pIVm4SjaH/myeGAMbaYBmYOU+JGN1keIMo5ZjDOg 2rv3mmp7FbYU2MMWZSEoYaakD+mrSmbtvl4B9a88R1H/PcLBTpwcGsFu0b0SfYhO i0KqyB0AMCVxWqF+S3XRMITUirPqRZj1Njf73tJfNQSyIMtsviG+hKBLubcxC1bH W3QN08GZ9Q7uDOH0SehaIegKctyeG+rJyyUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523471887; bh=bSYd04LKRupcOn0h4MEqtMdvT9WROb Z/5QIymNanY60=; b=ZziIG1EXJQ8ITGf1XSQynUIwKT1atYdW8q6WWjO0uGzJ78 a05ONjIhYgjuojSy2UCbRyJTLn+x5DRW3H9K1r5jidUsFrZH5nIVM4rHw08ucMmd LPhDQU9B0LF3AYGni9qQHdD9TW6zLut2cRQcyCubOn1FAHmD702pA9LP5tk8x+Cp GPG9LphZdL+kLWpsfxATOUu6OPoAzlh+ayTOB5dnIYLs6CiJP+eqM+MXJRrazUWu Z5J0mPufrxBCP136yohSikikoGpGhnOycLzfil7nlD6gnUWPs0zU+K5Qi8788FMe XSPw+FRjLXEiuHfax59MqiBHyC8TDnNhGNUG7lMw== ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfMKkicxfsZE95RDBdAUaZ4qulWfGruUee+tSFIXBY52mtXRaDR7FwJPZRJ1mB7eRrCnM62Dg0rwp53dDSsWaEY17aqlpiqbifnqYJbqrUBe154lyFraX POytA63JMKL3+IxzkQtmSsT2Jc/apsY3C9vkrzVKqI7CTG60di09lLRy7OszZ4yRitE7amyrHYtArQXjJtf2IIaG0Mjy6/g/CW6E43z4zpt9WkPrWlnq/DHF X-CM-Analysis: v=2.3 cv=NPP7BXyg c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=7ZN4cI0QAAAA:8 a=1XWaLZrsAAAA:8 a=yMhMjlubAAAA:8 a=ag1SF4gXAAAA:8 a=7loVob4iMjE_SrWWOpgA:9 a=QEXdDO2ut3YA:10 a=Dl0WHwQvj8hGZljrFLtM:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753784AbeDKSiE (ORCPT ); Wed, 11 Apr 2018 14:38:04 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:55208 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752584AbeDKSiA (ORCPT ); Wed, 11 Apr 2018 14:38:00 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrey Konovalov , Steffen Klassert , Sasha Levin Subject: [PATCH 3.18 003/121] af_key: Fix slab-out-of-bounds in pfkey_compile_policy. Date: Wed, 11 Apr 2018 20:35:06 +0200 Message-Id: <20180411183456.423402553@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183456.195010921@linuxfoundation.org> References: <20180411183456.195010921@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Steffen Klassert [ Upstream commit d90c902449a7561f1b1d58ba5a0d11728ce8b0b2 ] The sadb_x_sec_len is stored in the unit 'byte divided by eight'. So we have to multiply this value by eight before we can do size checks. Otherwise we may get a slab-out-of-bounds when we memcpy the user sec_ctx. Fixes: df71837d502 ("[LSM-IPSec]: Security association restriction.") Reported-by: Andrey Konovalov Tested-by: Andrey Konovalov Signed-off-by: Steffen Klassert Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- net/key/af_key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -3301,7 +3301,7 @@ static struct xfrm_policy *pfkey_compile p += pol->sadb_x_policy_len*8; sec_ctx = (struct sadb_x_sec_ctx *)p; if (len < pol->sadb_x_policy_len*8 + - sec_ctx->sadb_x_sec_len) { + sec_ctx->sadb_x_sec_len*8) { *dir = -EINVAL; goto out; }