From owner-svn-src-all@FreeBSD.ORG Tue May 13 23:36:56 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7CE6ADA7 for ; Tue, 13 May 2014 23:36:56 +0000 (UTC) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 036E42ACD for ; Tue, 13 May 2014 23:36:55 +0000 (UTC) Received: by mail-lb0-f170.google.com with SMTP id w7so839841lbi.1 for ; Tue, 13 May 2014 16:36:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=EZNUp0y6eiXhLbMe2J1yDDpwniy+tCc/y8/eF9gAVIc=; b=lifqfevmKkSpoXI8D5osywI34MrBoanJTjVkyx5xLyZDSEldXUANVv2zh0EtE+eK2a fO2r0/IgNPpwZbH0A1GESGja6JWFSyE1sdSxRff5MfI3oTBXvX9ZDIgyeaQvhx2nHn9j rCPIN/Q1+6w3X05M+EfRLsnoe1ivMZ8WHDox6YrLDxz82oLum0TpGdgetoqVpNm+LDSl +p1quF8QKPDV723GHLgwheyYCJXABjPg/tJxLZMvUzUHXbLKYzii3SbGOy7ZzzyTyhlo UvTT40vAw9VjPPrdaYrU6Oz7mioh73exoBRvaHKDxir6axLfXqwatDgzLYyhDd7n67Yz Qkaw== X-Gm-Message-State: ALoCoQlKlxggeDPKZb3LPAaJC73xAlIYTmHixWFVeAIzRs4rvccQY903PTon2A5c4I9VPAakK6Dr X-Received: by 10.112.35.14 with SMTP id d14mr94826lbj.43.1400024207238; Tue, 13 May 2014 16:36:47 -0700 (PDT) Received: from [192.168.1.2] ([89.169.173.68]) by mx.google.com with ESMTPSA id oc3sm49842lbb.18.2014.05.13.16.36.46 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 May 2014 16:36:46 -0700 (PDT) Message-ID: <5372AC8E.1070507@freebsd.org> Date: Wed, 14 May 2014 03:36:46 +0400 From: Andrey Chernov User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Xin LI , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r265986 - stable/10/crypto/openssl/ssl References: <201405132319.s4DNJH7T055013@svn.freebsd.org> In-Reply-To: <201405132319.s4DNJH7T055013@svn.freebsd.org> Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 May 2014 23:36:56 -0000 On 14.05.2014 3:19, Xin LI wrote: > Author: delphij > Date: Tue May 13 23:19:16 2014 > New Revision: 265986 > URL: http://svnweb.freebsd.org/changeset/base/265986 > > Log: > Fix OpenSSL NULL pointer deference vulnerability. > > Obtained from: OpenBSD > Security: FreeBSD-SA-14:09.openssl > Security: CVE-2014-0198 Official fix is a bit different: https://github.com/openssl/openssl/commit/b107586c0c3447ea22dba8698ebbcd81bb29d48c from https://rt.openssl.org/Ticket/Display.html?user=guest&pass=guest&id=3321 Do we follow official branch or OpenBSD fixes? > > Modified: > stable/10/crypto/openssl/ssl/s3_pkt.c > > Modified: stable/10/crypto/openssl/ssl/s3_pkt.c > ============================================================================== > --- stable/10/crypto/openssl/ssl/s3_pkt.c Tue May 13 23:17:24 2014 (r265985) > +++ stable/10/crypto/openssl/ssl/s3_pkt.c Tue May 13 23:19:16 2014 (r265986) > @@ -657,6 +657,10 @@ static int do_ssl3_write(SSL *s, int typ > if (i <= 0) > return(i); > /* if it went, fall through and send more stuff */ > + /* we may have released our buffer, so get it again */ > + if (wb->buf == NULL) > + if (!ssl3_setup_write_buffer(s)) > + return -1; > } > > if (len == 0 && !create_empty_fragment) > -- http://ache.vniz.net/