From owner-svn-src-all@FreeBSD.ORG Sun Aug 23 13:58:26 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DC26106568D; Sun, 23 Aug 2009 13:58:26 +0000 (UTC) (envelope-from simon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 01FAD8FC1E; Sun, 23 Aug 2009 13:58:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7NDwPLY062542; Sun, 23 Aug 2009 13:58:25 GMT (envelope-from simon@svn.freebsd.org) Received: (from simon@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7NDwPNf062541; Sun, 23 Aug 2009 13:58:25 GMT (envelope-from simon@svn.freebsd.org) Message-Id: <200908231358.n7NDwPNf062541@svn.freebsd.org> From: "Simon L. Nielsen" Date: Sun, 23 Aug 2009 13:58:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor-crypto MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196461 - in vendor-crypto/openssl/dist: crypto/pqueue ssl X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Sun, 23 Aug 2009 13:58:26 -0000 Author: simon Date: Sun Aug 23 13:58:25 2009 New Revision: 196461 URL: http://svn.freebsd.org/changeset/base/196461 Log: Import DTLS fix from upstream OpenSSL 0.9.8 branch: Fix memory consumption bug with "future epoch" DTLS records. Note that this will not get FreeBSD Security Advisory as DTLS is experimental in OpenSSL. Security: CVE-2009-1377 Obtained from: OpenSSL CVS http://cvs.openssl.org/chngview?cn=18187 Modified: vendor-crypto/openssl/dist/crypto/pqueue/pqueue.c vendor-crypto/openssl/dist/crypto/pqueue/pqueue.h vendor-crypto/openssl/dist/ssl/d1_pkt.c Modified: vendor-crypto/openssl/dist/crypto/pqueue/pqueue.c ============================================================================== --- vendor-crypto/openssl/dist/crypto/pqueue/pqueue.c Sun Aug 23 12:44:15 2009 (r196460) +++ vendor-crypto/openssl/dist/crypto/pqueue/pqueue.c Sun Aug 23 13:58:25 2009 (r196461) @@ -234,3 +234,17 @@ pqueue_next(pitem **item) return ret; } + +int +pqueue_size(pqueue_s *pq) +{ + pitem *item = pq->items; + int count = 0; + + while(item != NULL) + { + count++; + item = item->next; + } + return count; +} Modified: vendor-crypto/openssl/dist/crypto/pqueue/pqueue.h ============================================================================== --- vendor-crypto/openssl/dist/crypto/pqueue/pqueue.h Sun Aug 23 12:44:15 2009 (r196460) +++ vendor-crypto/openssl/dist/crypto/pqueue/pqueue.h Sun Aug 23 13:58:25 2009 (r196461) @@ -91,5 +91,6 @@ pitem *pqueue_iterator(pqueue pq); pitem *pqueue_next(piterator *iter); void pqueue_print(pqueue pq); +int pqueue_size(pqueue pq); #endif /* ! HEADER_PQUEUE_H */ Modified: vendor-crypto/openssl/dist/ssl/d1_pkt.c ============================================================================== --- vendor-crypto/openssl/dist/ssl/d1_pkt.c Sun Aug 23 12:44:15 2009 (r196460) +++ vendor-crypto/openssl/dist/ssl/d1_pkt.c Sun Aug 23 13:58:25 2009 (r196461) @@ -167,6 +167,10 @@ dtls1_buffer_record(SSL *s, record_pqueu DTLS1_RECORD_DATA *rdata; pitem *item; + /* Limit the size of the queue to prevent DOS attacks */ + if (pqueue_size(queue->q) >= 100) + return 0; + rdata = OPENSSL_malloc(sizeof(DTLS1_RECORD_DATA)); item = pitem_new(priority, rdata); if (rdata == NULL || item == NULL)