httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_scache_shmcb.c
Date Tue, 01 Jun 2004 20:27:11 GMT
jorton      2004/06/01 13:27:11

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/ssl Tag: APACHE_2_0_BRANCH ssl_scache_shmcb.c
  Log:
  * modules/ssl/ssl_scache_shmcb.c (shmcb_cyclic_ntoc_memcpy,
  shmcb_cyclic_cton_memcpy): Fix potential shmcb segfault for small
  cache sizes.
  
  PR: 27751
  Submitted by: Geoff Thorpe <geoff geoffthorpe.net>
  Reviewed by: Madhusudan Mathihalli, Joe Orton, Jeff Trawick
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.291 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.290
  retrieving revision 1.988.2.291
  diff -d -u -r1.988.2.290 -r1.988.2.291
  --- CHANGES	1 Jun 2004 15:30:15 -0000	1.988.2.290
  +++ CHANGES	1 Jun 2004 20:27:10 -0000	1.988.2.291
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.50
   
  +  *) mod_ssl: Fix a potential segfault in the 'shmcb' session cache for
  +     small cache sizes.  PR 27751.  [Geoff Thorpe <geoff geoffthorpe.net>]
  +
     *) Remove 2Gb log file size restriction on some 32-bit platforms.
        PR 13511.  [Joe Orton]
   
  
  
  
  1.751.2.894 +1 -5      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.893
  retrieving revision 1.751.2.894
  diff -d -u -r1.751.2.893 -r1.751.2.894
  --- STATUS	1 Jun 2004 15:30:15 -0000	1.751.2.893
  +++ STATUS	1 Jun 2004 20:27:10 -0000	1.751.2.894
  @@ -96,10 +96,6 @@
          build/rpm/httpd.spec.in: r1.5
          +1: minfrin, nd
   
  -    *) mod_ssl: Fix potential SEGV in 'shmcb' session cache.
  -       modules/ssl/ssl_scache_shmcb.c: r1.26
  -       +1: madhum, jorton, trawick
  -
       *) mod_cgi: Handle stderr output during script execution
          http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/generators/mod_cgi.c?r1=1.160&r2=1.163
          PR: 22030, 18348
  
  
  
  No                   revision
  No                   revision
  1.16.2.5  +8 -0      httpd-2.0/modules/ssl/ssl_scache_shmcb.c
  
  Index: ssl_scache_shmcb.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_scache_shmcb.c,v
  retrieving revision 1.16.2.4
  retrieving revision 1.16.2.5
  diff -d -u -r1.16.2.4 -r1.16.2.5
  --- ssl_scache_shmcb.c	9 Feb 2004 20:53:20 -0000	1.16.2.4
  +++ ssl_scache_shmcb.c	1 Jun 2004 20:27:11 -0000	1.16.2.5
  @@ -848,6 +848,10 @@
       unsigned int dest_offset,
       unsigned char *src, unsigned int src_len)
   {
  +    /* Cover the case that src_len > buf_size */
  +    if (src_len > buf_size)
  +        src_len = buf_size;
  +
       /* Can it be copied all in one go? */
       if (dest_offset + src_len < buf_size)
           /* yes */
  @@ -871,6 +875,10 @@
       unsigned int src_offset,
       unsigned int src_len)
   {
  +    /* Cover the case that src_len > buf_size */
  +    if (src_len > buf_size)
  +        src_len = buf_size;
  +
       /* Can it be copied all in one go? */
       if (src_offset + src_len < buf_size)
           /* yes */
  
  
  

Mime
View raw message