From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x22743A2TmSwYSunBjJy4gVRnfx8ZbTu8QiGQFBoMctv/fJ8ZAWSfvkC2KnDr7RDHBcE+2+0q ARC-Seal: i=1; a=rsa-sha256; t=1516611154; cv=none; d=google.com; s=arc-20160816; b=jULq6k5L4V19nwgpHpMWFW3UIJKPxSrUvZMx6bux1eeOHqpNuELDEuf89dnSleEiUN /I3EDS2OqE3KTsDE4H9yEBi3UUspG8HGzVWH5Mk7ZZyQfrhKVcYecBvI/eJwwdFQCZRk FR1OYfF3sIzMk9B1q/KTgzMJClVn1YInlE6cbT1+rtnqMBnlBPHuLb/LF54u3XrQIdSp qJVaKqLQjIZ9iGTqGkrqZG93e5u+rFOF+8nSuu6XB3WyTsYFNJMzy+d709c0XI4Q29lz F9XSVHVAFWETXfp16Ysk6blh6PWr2NDFmGTbFxS4kY2cy8zgKPbEuJ3HX2k5qkzYXssI +5EQ== 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=QDlbnDgTr1t04JXoxD9C3ai3nOIkNC3bN1TdUfdbqmA=; b=HZGgratTohZb4FeSdESBayWepdW4JAUVj+QcyKGWcU84QzlqVvC6Zo2T5quRHeUMQQ RStKN+6rwkvc10UIxI0iaL+eFqKSAbN1CIiT6337Cc/P+zglJsFVCkkhC5KCvozHnWVY DBAPa+Hl7LTH96OLqrstn+Pb0J+MxbnOkKCQBTafduMGcWl7aaalEbxMdn1n3XiwPBtu QqiA0ENccRE7+C4ZPH3DKIMFTkVDNGK7wnKqjFWY33+mxPe1uvfyZZqNyroncRybAT9D 2EmvBiBU9C4dovne1E+g6swTlBh/DM9sb7WTS4r8/Dx7upxTyeP/CsM/tQEQitX3mICv /Kqg== 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.14 26/89] af_key: fix buffer overread in parse_exthdrs() Date: Mon, 22 Jan 2018 09:45:06 +0100 Message-Id: <20180122083957.279048095@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083954.683903493@linuxfoundation.org> References: <20180122083954.683903493@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?1590282058941185977?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-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;