Commit f722f18e authored by Matt Caswell's avatar Matt Caswell
Browse files

Add a DSO_dsobyaddr() function 



This works the same way as DSO_pathbyaddr() but instead returns a ptr to
the DSO that contains the provided symbol.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(cherry picked from commit b39eda7e)
parent 93558bf5

crypto/dso/dso_lib.c

+20 −3
Original line number Diff line number Diff line
@@ -73,10 +73,12 @@ int DSO_free(DSO *dso) 
        return 1;

    REF_ASSERT_ISNT(i < 0);



    if ((dso->flags & DSO_FLAG_NO_UNLOAD_ON_FREE) == 0) {

        if ((dso->meth->dso_unload != NULL) && !dso->meth->dso_unload(dso)) {

            DSOerr(DSO_F_DSO_FREE, DSO_R_UNLOAD_FAILED);

            return 0;

        }

    }



    if ((dso->meth->finish != NULL) && !dso->meth->finish(dso)) {

        DSOerr(DSO_F_DSO_FREE, DSO_R_FINISH_FAILED);
@@ -316,6 +318,21 @@ int DSO_pathbyaddr(void *addr, char *path, int sz) 
    return (*meth->pathbyaddr) (addr, path, sz);

}



DSO *DSO_dsobyaddr(void *addr, int flags)

{

    DSO *ret = NULL;

    char *filename = NULL;

    int len = DSO_pathbyaddr(addr, NULL, 0);



    filename = OPENSSL_malloc(len);

    if (filename != NULL

            && DSO_pathbyaddr(addr, filename, len) == len)

        ret = DSO_load(NULL, filename, NULL, flags);



    OPENSSL_free(filename);

    return ret;

}



void *DSO_global_lookup(const char *name)

{

    DSO_METHOD *meth = default_DSO_meth;

include/internal/dso.h

+10 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ extern "C" { 
 */

# define DSO_FLAG_NAME_TRANSLATION_EXT_ONLY      0x02



/*

 * Don't unload the DSO when we call DSO_free()

 */

# define DSO_FLAG_NO_UNLOAD_ON_FREE              0x04

/*

 * The following flag controls the translation of symbol names to upper case.

 * This is currently only being implemented for OpenVMS.
@@ -147,6 +151,12 @@ DSO_METHOD *DSO_METHOD_openssl(void); 
 */

int DSO_pathbyaddr(void *addr, char *path, int sz);



/*

 * Like DSO_pathbyaddr() but instead returns a handle to the DSO for the symbol

 * or NULL on error.

 */

DSO *DSO_dsobyaddr(void *addr, int flags);



/*

 * This function should be used with caution! It looks up symbols in *all*

 * loaded modules and if module gets unloaded by somebody else attempt to

util/libcrypto.num

+1 −0
Original line number Diff line number Diff line
@@ -4207,3 +4207,4 @@ OCSP_RESPID_set_by_name 4157 1_1_0a EXIST::FUNCTION:OCSP 
OCSP_RESPID_set_by_key                  4158	1_1_0a	EXIST::FUNCTION:OCSP

OCSP_RESPID_match                       4159	1_1_0a	EXIST::FUNCTION:OCSP

DSO_pathbyaddr                          4170	1_1_0c	EXIST::FUNCTION:

DSO_dsobyaddr                           4171	1_1_0c	EXIST::FUNCTION: