You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

28 lines
936 B

  1. commit 892c21240adb9ac230d4bd27cc8be4767b4902aa
  2. Author: Willy Tarreau <w@1wt.eu>
  3. Date: Mon Oct 15 13:20:07 2018 +0200
  4. BUILD: ssl: fix another null-deref warning in ssl_sock_switchctx_cbk()
  5. This null-deref cannot happen either as there necesarily is a listener
  6. where this function is called. Let's use __objt_listener() to address
  7. this.
  8. This may be backported to 1.8.
  9. (cherry picked from commit a8825520b785d592467c45e183ad8213cb7bf891)
  10. Signed-off-by: Willy Tarreau <w@1wt.eu>
  11. diff --git a/src/ssl_sock.c b/src/ssl_sock.c
  12. index 4577fef4..cfbc38b7 100644
  13. --- a/src/ssl_sock.c
  14. +++ b/src/ssl_sock.c
  15. @@ -2113,7 +2113,7 @@ static int ssl_sock_switchctx_cbk(SSL *ssl, int *al, void *arg)
  16. int i;
  17. conn = SSL_get_ex_data(ssl, ssl_app_data_index);
  18. - s = objt_listener(conn->target)->bind_conf;
  19. + s = __objt_listener(conn->target)->bind_conf;
  20. if (s->ssl_conf.early_data)
  21. allow_early = 1;