Commit 13f70ae2 authored by Rich Salz's avatar Rich Salz
Browse files

Check fflush on BIO_ctrl call 



Bug found and fix suggested by Julian Rüth.
Push error if fflush fails

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3266

)
(cherry picked from commit 595b2a42)
Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3348)
parent de46e824

crypto/bio/bss_file.c

+9 −4
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr) 
    FILE *fp = (FILE *)b->ptr;

    FILE **fpp;

    char p[4];

    int st;



    switch (cmd) {

    case BIO_C_FILE_SEEK:
@@ -427,10 +428,14 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr) 
        b->shutdown = (int)num;

        break;

    case BIO_CTRL_FLUSH:

        if (b->flags & BIO_FLAGS_UPLINK)

            UP_fflush(b->ptr);

        else

            fflush((FILE *)b->ptr);

        st = b->flags & BIO_FLAGS_UPLINK

                ? UP_fflush(b->ptr) : fflush((FILE *)b->ptr);

        if (st == EOF) {

            SYSerr(SYS_F_FFLUSH, get_last_sys_error());

            ERR_add_error_data(1, "fflush()");

            BIOerr(BIO_F_FILE_CTRL, ERR_R_SYS_LIB);

            ret = 0;

        }

        break;

    case BIO_CTRL_DUP:

        ret = 1;

crypto/err/err.c

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ static ERR_STRING_DATA ERR_str_functs[] = { 
# endif

    {ERR_PACK(0, SYS_F_OPENDIR, 0), "opendir"},

    {ERR_PACK(0, SYS_F_FREAD, 0), "fread"},

    {ERR_PACK(0, SYS_F_FFLUSH, 0), "fflush"},

    {0, NULL},

};

crypto/err/err.h

+1 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ typedef struct err_state_st { 
# define SYS_F_WSASTARTUP        9/* Winsock stuff */

# define SYS_F_OPENDIR           10

# define SYS_F_FREAD             11

# define SYS_F_FFLUSH            18



/* reasons */

# define ERR_R_SYS_LIB   ERR_LIB_SYS/* 2 */