From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x2279V6oMkcnrrsBcYtwsT/k0c2w8DXXJHvB2jgB+1SfZFdoZ0g2M/UFwGqhWWteFfuZ6SX6G ARC-Seal: i=1; a=rsa-sha256; t=1516610862; cv=none; d=google.com; s=arc-20160816; b=mRugqqgYi0kNUhbaqmMKO/Y+u2KhXRdGHr1J12RkiNdwEhXVeT6bNVsOb6Uogks/e9 yE/S5YRRS9l+ZGMG1S9E2ohsTptlPwdeQZFEHBtVT+KaK6+ybFCbJ2ZSkJVmpd5U2pbE hbsUGYFnTsmVp7Kj8d9zGJZttIAI+AwWdWu4jNNBVdW9LW87LD9x58ZYvVKDTeAWNH5U 7dwfIMM/Fsydz5cJ3ryrdmySQTXDbxzKn9reAnx/1OUAMOJgqrb8dd3JKVrXSD5xh3mT wpnzkhjKRe/9bYw1StfVOCCBY3FjEWG5YDNU0+P+I1Zxer6ELmJSSD6YdQ0BoIz/8cs1 knsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=wmXRKvm8r51WuMuoCR3ArydJnaGILLi16apQ/5R25DI=; b=eGvhv7KJ6l1aPiwLMghapLAneKblI9vP+9mCP6B1fT1swjI4q5unTEmFGASnmknEju bpzBqY5ApN50YRR8pyInOUd+YtsGFrTS5gro4By4ihON/PQTuvd5nf3N2sRDqP8wtiwC YITA7oLqsgKskTR5wFfP4Yoh6dOI9ztDl+HMw296NB5XA2dRvg+hfQrhMzhRC6dG2vqi EYtiu2ZWqm6X7pD5Ay69mWmoGL9JYt4IcA+E/wGdXq/VEU67Tia203obuLveXkG1ELKo DGHNdf6g2Laweqm0jiuwK2dR3WRMWMc2SThTM/TRNOsrKpnI9qjCQ6tWfYTj7j3RF5dK WqJg== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org 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.9 10/47] af_key: fix buffer overread in parse_exthdrs() Date: Mon, 22 Jan 2018 09:45:21 +0100 Message-Id: <20180122083926.420595155@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083925.568134913@linuxfoundation.org> References: <20180122083925.568134913@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590281379336995100?= X-GMAIL-MSGID: =?utf-8?q?1590281752191800108?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-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;