From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1392597-1516610512-2-15165127077365702722 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, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, 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=arctest; t=1516610511; b=wvB1p6xspIQKwJq3ik6oKpZ+MaOoYwxnmTPCdLZ5amUccg3 xLMkYl5SqOrm1DbUwm/4oC5tVYidXQXCM4cGQiDAVLETZjI10MtzXb8qj495MoMV ofo1V8ngdeAO4Csv7DrhujytzLCZ/IpCmzWUAI1/lv6t/rGx28jN1q0op4K9J+xR o5bY1tSpYdcrAPNyQP5ACRFzlpeqnnptzTk8uwXVn2kJvUNLKzxUOHihgCrHKF2m xGE1HwXn2fR2KdEfPCX63eWUQM5JEBu/zs9fQcAT/YXqEhi0ZjsRXlL+VIO3OS+7 2aBPY+j6Va/eUbRcgk1OyQDvQ3sqULc75+fNZwQ== 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=arctest; t=1516610511; bh=OQSPQ/bdO7Qr3brIda4gxuEJlL JLIpjOvAUEB0FKTv0=; b=gQKQOFxG98X47lGfCAENM3jPyN9CdtUpCpV6JRQ9xp yvnOUMJ7+wDu7xugoEDP36JaD2pNmcO66lraGJi3zcCzCubvBlqabpt0VC9BrzQJ +RBNOwPH5V6XiFQvfKX1kb+fb0g99bJyxSoTcGOKBhRDsNTO+ijUhy7CmvHuH8lj g+ESxscEDCpp4sP+NyDPCEKDelP0V3ZNece6I5TOMcm3Z6Gf7SSjsXhPZkcgis8u 0E2rJO+fRxQmFCBJ2pvufFTQZ14ZsC1oUUGu+v9JLXauQqBqGbxMaUqA0dPy4Imv AVpP/alYAbJH9DguRl6FX8nduwmtqvdhd4n5pY27es/g== ARC-Authentication-Results: i=1; mx1.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-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 Authentication-Results: mx1.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-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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751536AbeAVIls (ORCPT ); Mon, 22 Jan 2018 03:41:48 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:58622 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751093AbeAVIlq (ORCPT ); Mon, 22 Jan 2018 03:41:46 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Biggers , Steffen Klassert Subject: [PATCH 4.4 27/53] af_key: fix buffer overread in parse_exthdrs() Date: Mon, 22 Jan 2018 09:40:19 +0100 Message-Id: <20180122083911.488888963@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083910.299610926@linuxfoundation.org> References: <20180122083910.299610926@linuxfoundation.org> User-Agent: quilt/0.65 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: 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Biggers commit 4e765b4972af7b07adcb1feb16e7a525ce1f6b28 upstream. If a message sent to a PF_KEY socket ended with an incomplete extension header (fewer than 4 bytes remaining), then parse_exthdrs() read past the end of the message, into uninitialized memory. Fix it by returning -EINVAL in this case. Reproducer: #include #include #include int main() { int sock = socket(PF_KEY, SOCK_RAW, PF_KEY_V2); char buf[17] = { 0 }; struct sadb_msg *msg = (void *)buf; msg->sadb_msg_version = PF_KEY_V2; msg->sadb_msg_type = SADB_DELETE; msg->sadb_msg_len = 2; write(sock, buf, 17); } Signed-off-by: Eric Biggers Signed-off-by: Steffen Klassert Signed-off-by: Greg Kroah-Hartman --- net/key/af_key.c | 3 +++ 1 file changed, 3 insertions(+) --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -516,6 +516,9 @@ static int parse_exthdrs(struct sk_buff uint16_t ext_type; int ext_len; + if (len < sizeof(*ehdr)) + return -EINVAL; + ext_len = ehdr->sadb_ext_len; ext_len *= sizeof(uint64_t); ext_type = ehdr->sadb_ext_type;