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.

29 lines
1.1 KiB

  1. commit d332b12b262ad7df1c8bdda52dad100f40399d24
  2. Author: Willy Tarreau <w@1wt.eu>
  3. Date: Mon Oct 15 11:01:59 2018 +0200
  4. BUILD: ssl: fix null-deref warning in ssl_fc_cipherlist_str sample fetch
  5. Gcc 6.4 detects a potential null-deref warning in smp_fetch_ssl_fc_cl_str().
  6. This one is not real since already addressed a few lines above. Let's use
  7. __objt_conn() instead of objt_conn() to avoid the extra test that confuses
  8. it.
  9. This could be backported to 1.8.
  10. (cherry picked from commit b729077710b14c75936909409e27a4fa0badcb54)
  11. Signed-off-by: Willy Tarreau <w@1wt.eu>
  12. diff --git a/src/ssl_sock.c b/src/ssl_sock.c
  13. index 6eed8022..4577fef4 100644
  14. --- a/src/ssl_sock.c
  15. +++ b/src/ssl_sock.c
  16. @@ -6929,7 +6929,7 @@ smp_fetch_ssl_fc_cl_str(const struct arg *args, struct sample *smp, const char *
  17. #if defined(OPENSSL_IS_BORINGSSL)
  18. cipher = SSL_get_cipher_by_value(id);
  19. #else
  20. - struct connection *conn = objt_conn(smp->sess->origin);
  21. + struct connection *conn = __objt_conn(smp->sess->origin);
  22. cipher = SSL_CIPHER_find(conn->xprt_ctx, bin);
  23. #endif
  24. str = SSL_CIPHER_get_name(cipher);