Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/03: [MBEDTLS] Update to version 2.7.11. CORE-16147
by Thomas Faber 27 Jun '19

27 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=430656f0b9bb30adf960b… commit 430656f0b9bb30adf960b7aa47036e73da07907e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Jun 27 11:04:40 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Jun 27 12:52:00 2019 +0200 [MBEDTLS] Update to version 2.7.11. CORE-16147 --- dll/3rdparty/mbedtls/bignum.c | 28 ++++-- dll/3rdparty/mbedtls/certs.c | 94 ++++++++++++------ dll/3rdparty/mbedtls/debug.c | 44 +++++++-- dll/3rdparty/mbedtls/ecdh.c | 16 +++- dll/3rdparty/mbedtls/ssl_tls.c | 143 +++++++++++++++------------- dll/3rdparty/mbedtls/x509.c | 51 +++++----- dll/3rdparty/mbedtls/x509_crl.c | 10 +- dll/3rdparty/mbedtls/x509_crt.c | 13 ++- media/doc/3rd Party Files.txt | 2 +- sdk/include/reactos/libs/mbedtls/config.h | 4 +- sdk/include/reactos/libs/mbedtls/ssl.h | 21 +++- sdk/include/reactos/libs/mbedtls/version.h | 8 +- sdk/include/reactos/libs/mbedtls/x509_crt.h | 2 +- 13 files changed, 271 insertions(+), 165 deletions(-) diff --git a/dll/3rdparty/mbedtls/bignum.c b/dll/3rdparty/mbedtls/bignum.c index 9b4eee48937..a7e3e5f791b 100644 --- a/dll/3rdparty/mbedtls/bignum.c +++ b/dll/3rdparty/mbedtls/bignum.c @@ -554,15 +554,20 @@ int mbedtls_mpi_write_string( const mbedtls_mpi *X, int radix, if( radix < 2 || radix > 16 ) return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA ); - n = mbedtls_mpi_bitlen( X ); - if( radix >= 4 ) n >>= 1; - if( radix >= 16 ) n >>= 1; - /* - * Round up the buffer length to an even value to ensure that there is - * enough room for hexadecimal values that can be represented in an odd - * number of digits. - */ - n += 3 + ( ( n + 1 ) & 1 ); + n = mbedtls_mpi_bitlen( X ); /* Number of bits necessary to present `n`. */ + if( radix >= 4 ) n >>= 1; /* Number of 4-adic digits necessary to present + * `n`. If radix > 4, this might be a strict + * overapproximation of the number of + * radix-adic digits needed to present `n`. */ + if( radix >= 16 ) n >>= 1; /* Number of hexadecimal digits necessary to + * present `n`. */ + + n += 1; /* Terminating null byte */ + n += 1; /* Compensate for the divisions above, which round down `n` + * in case it's not even. */ + n += 1; /* Potential '-'-sign. */ + n += ( n & 1 ); /* Make n even to have enough space for hexadecimal writing, + * which always uses an even number of hex-digits. */ if( buflen < n ) { @@ -574,7 +579,10 @@ int mbedtls_mpi_write_string( const mbedtls_mpi *X, int radix, mbedtls_mpi_init( &T ); if( X->s == -1 ) + { *p++ = '-'; + buflen--; + } if( radix == 16 ) { @@ -1681,8 +1689,10 @@ int mbedtls_mpi_exp_mod( mbedtls_mpi *X, const mbedtls_mpi *A, const mbedtls_mpi wsize = ( i > 671 ) ? 6 : ( i > 239 ) ? 5 : ( i > 79 ) ? 4 : ( i > 23 ) ? 3 : 1; +#if( MBEDTLS_MPI_WINDOW_SIZE < 6 ) if( wsize > MBEDTLS_MPI_WINDOW_SIZE ) wsize = MBEDTLS_MPI_WINDOW_SIZE; +#endif j = N->n + 1; MBEDTLS_MPI_CHK( mbedtls_mpi_grow( X, j ) ); diff --git a/dll/3rdparty/mbedtls/certs.c b/dll/3rdparty/mbedtls/certs.c index dd9d02ba31c..b143db4a46e 100644 --- a/dll/3rdparty/mbedtls/certs.c +++ b/dll/3rdparty/mbedtls/certs.c @@ -118,7 +118,6 @@ const size_t mbedtls_test_cli_key_ec_len = sizeof( mbedtls_test_cli_key_ec ); #endif /* MBEDTLS_ECDSA_C */ #if defined(MBEDTLS_RSA_C) - #if defined(MBEDTLS_SHA256_C) #define TEST_CA_CRT_RSA_SHA256 \ "-----BEGIN CERTIFICATE-----\r\n" \ @@ -143,13 +142,11 @@ const size_t mbedtls_test_cli_key_ec_len = sizeof( mbedtls_test_cli_key_ec ); "n20NRVA1Vjs6GAROr4NqW4k/+LofY9y0LLDE+p0oIEKXIsIvhPr39swxSA==\r\n" \ "-----END CERTIFICATE-----\r\n" +static const char mbedtls_test_ca_crt_rsa_sha256[] = TEST_CA_CRT_RSA_SHA256; const char mbedtls_test_ca_crt_rsa[] = TEST_CA_CRT_RSA_SHA256; const size_t mbedtls_test_ca_crt_rsa_len = sizeof( mbedtls_test_ca_crt_rsa ); #define TEST_CA_CRT_RSA_SOME - -static const char mbedtls_test_ca_crt_rsa_sha256[] = TEST_CA_CRT_RSA_SHA256; - -#endif +#endif /* MBEDTLS_SHA256_C */ #if !defined(TEST_CA_CRT_RSA_SOME) || defined(MBEDTLS_SHA1_C) #define TEST_CA_CRT_RSA_SHA1 \ @@ -175,14 +172,72 @@ static const char mbedtls_test_ca_crt_rsa_sha256[] = TEST_CA_CRT_RSA_SHA256; "7Z2mCGDNMhjQc+BYcdnl0lPXjdDK6V0qCg1dVewhUBcW5gZKzV7e9+DpVA==\r\n" \ "-----END CERTIFICATE-----\r\n" +static const char mbedtls_test_ca_crt_rsa_sha1[] = TEST_CA_CRT_RSA_SHA1; + #if !defined (TEST_CA_CRT_RSA_SOME) const char mbedtls_test_ca_crt_rsa[] = TEST_CA_CRT_RSA_SHA1; const size_t mbedtls_test_ca_crt_rsa_len = sizeof( mbedtls_test_ca_crt_rsa ); -#endif +#endif /* !TEST_CA_CRT_RSA_SOME */ +#endif /* !TEST_CA_CRT_RSA_COME || MBEDTLS_SHA1_C */ -static const char mbedtls_test_ca_crt_rsa_sha1[] = TEST_CA_CRT_RSA_SHA1; +#if defined(MBEDTLS_SHA256_C) +/* tests/data_files/server2-sha256.crt */ +#define TEST_SRV_CRT_RSA_SHA256 \ +"-----BEGIN CERTIFICATE-----\r\n" \ +"MIIDNzCCAh+gAwIBAgIBAjANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJOTDER\r\n" \ +"MA8GA1UECgwIUG9sYXJTU0wxGTAXBgNVBAMMEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n" \ +"MTEwMjEyMTQ0NDA2WhcNMjEwMjEyMTQ0NDA2WjA0MQswCQYDVQQGEwJOTDERMA8G\r\n" \ +"A1UECgwIUG9sYXJTU0wxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcN\r\n" \ +"AQEBBQADggEPADCCAQoCggEBAMFNo93nzR3RBNdJcriZrA545Do8Ss86ExbQWuTN\r\n" \ +"owCIp+4ea5anUrSQ7y1yej4kmvy2NKwk9XfgJmSMnLAofaHa6ozmyRyWvP7BBFKz\r\n" \ +"NtSj+uGxdtiQwWG0ZlI2oiZTqqt0Xgd9GYLbKtgfoNkNHC1JZvdbJXNG6AuKT2kM\r\n" \ +"tQCQ4dqCEGZ9rlQri2V5kaHiYcPNQEkI7mgM8YuG0ka/0LiqEQMef1aoGh5EGA8P\r\n" \ +"hYvai0Re4hjGYi/HZo36Xdh98yeJKQHFkA4/J/EwyEoO79bex8cna8cFPXrEAjya\r\n" \ +"HT4P6DSYW8tzS1KW2BGiLICIaTla0w+w3lkvEcf36hIBMJcCAwEAAaNNMEswCQYD\r\n" \ +"VR0TBAIwADAdBgNVHQ4EFgQUpQXoZLjc32APUBJNYKhkr02LQ5MwHwYDVR0jBBgw\r\n" \ +"FoAUtFrkpbPe0lL2udWmlQ/rPrzH/f8wDQYJKoZIhvcNAQELBQADggEBAGGEshT5\r\n" \ +"kvnRmLVScVeUEdwIrvW7ezbGbUvJ8VxeJ79/HSjlLiGbMc4uUathwtzEdi9R/4C5\r\n" \ +"DXBNeEPTkbB+fhG1W06iHYj/Dp8+aaG7fuDxKVKHVZSqBnmQLn73ymyclZNHii5A\r\n" \ +"3nTS8WUaHAzxN/rajOtoM7aH1P9tULpHrl+7HOeLMpxUnwI12ZqZaLIzxbcdJVcr\r\n" \ +"ra2F00aXCGkYVLvyvbZIq7LC+yVysej5gCeQYD7VFOEks0jhFjrS06gP0/XnWv6v\r\n" \ +"eBoPez9d+CCjkrhseiWzXOiriIMICX48EloO/DrsMRAtvlwq7EDz4QhILz6ffndm\r\n" \ +"e4K1cVANRPN2o9Y=\r\n" \ +"-----END CERTIFICATE-----\r\n" -#endif +const char mbedtls_test_srv_crt_rsa[] = TEST_SRV_CRT_RSA_SHA256; +const size_t mbedtls_test_srv_crt_rsa_len = sizeof( mbedtls_test_srv_crt_rsa ); +#define TEST_SRV_CRT_RSA_SOME +#endif /* MBEDTLS_SHA256_C */ + +#if !defined(TEST_SRV_CRT_RSA_SOME) || defined(MBEDTLS_SHA1_C) +/* tests/data_files/server2.crt */ +#define TEST_SRV_CRT_RSA_SHA1 \ +"-----BEGIN CERTIFICATE-----\r\n" \ +"MIIDNzCCAh+gAwIBAgIBAjANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER\r\n" \ +"MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n" \ +"MTEwMjEyMTQ0NDA2WhcNMjEwMjEyMTQ0NDA2WjA0MQswCQYDVQQGEwJOTDERMA8G\r\n" \ +"A1UEChMIUG9sYXJTU0wxEjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcN\r\n" \ +"AQEBBQADggEPADCCAQoCggEBAMFNo93nzR3RBNdJcriZrA545Do8Ss86ExbQWuTN\r\n" \ +"owCIp+4ea5anUrSQ7y1yej4kmvy2NKwk9XfgJmSMnLAofaHa6ozmyRyWvP7BBFKz\r\n" \ +"NtSj+uGxdtiQwWG0ZlI2oiZTqqt0Xgd9GYLbKtgfoNkNHC1JZvdbJXNG6AuKT2kM\r\n" \ +"tQCQ4dqCEGZ9rlQri2V5kaHiYcPNQEkI7mgM8YuG0ka/0LiqEQMef1aoGh5EGA8P\r\n" \ +"hYvai0Re4hjGYi/HZo36Xdh98yeJKQHFkA4/J/EwyEoO79bex8cna8cFPXrEAjya\r\n" \ +"HT4P6DSYW8tzS1KW2BGiLICIaTla0w+w3lkvEcf36hIBMJcCAwEAAaNNMEswCQYD\r\n" \ +"VR0TBAIwADAdBgNVHQ4EFgQUpQXoZLjc32APUBJNYKhkr02LQ5MwHwYDVR0jBBgw\r\n" \ +"FoAUtFrkpbPe0lL2udWmlQ/rPrzH/f8wDQYJKoZIhvcNAQEFBQADggEBAJxnXClY\r\n" \ +"oHkbp70cqBrsGXLybA74czbO5RdLEgFs7rHVS9r+c293luS/KdliLScZqAzYVylw\r\n" \ +"UfRWvKMoWhHYKp3dEIS4xTXk6/5zXxhv9Rw8SGc8qn6vITHk1S1mPevtekgasY5Y\r\n" \ +"iWQuM3h4YVlRH3HHEMAD1TnAexfXHHDFQGe+Bd1iAbz1/sH9H8l4StwX6egvTK3M\r\n" \ +"wXRwkKkvjKaEDA9ATbZx0mI8LGsxSuCqe9r9dyjmttd47J1p1Rulz3CLzaRcVIuS\r\n" \ +"RRQfaD8neM9c1S/iJ/amTVqJxA1KOdOS5780WhPfSArA+g4qAmSjelc3p4wWpha8\r\n" \ +"zhuYwjVuX6JHG0c=\r\n" \ +"-----END CERTIFICATE-----\r\n"; + +#if !defined(TEST_SRV_CRT_RSA_SOME) +const char mbedtls_test_srv_crt_rsa[] = TEST_SRV_CRT_RSA_SHA1; +const size_t mbedtls_test_srv_crt_rsa_len = sizeof( mbedtls_test_srv_crt_rsa ); +#endif /* TEST_SRV_CRT_RSA_SOME */ +#endif /* !TEST_CA_CRT_RSA_SOME || MBEDTLS_SHA1_C */ const char mbedtls_test_ca_key_rsa[] = "-----BEGIN RSA PRIVATE KEY-----\r\n" @@ -220,29 +275,6 @@ const size_t mbedtls_test_ca_key_rsa_len = sizeof( mbedtls_test_ca_key_rsa ); const char mbedtls_test_ca_pwd_rsa[] = "PolarSSLTest"; const size_t mbedtls_test_ca_pwd_rsa_len = sizeof( mbedtls_test_ca_pwd_rsa ) - 1; -const char mbedtls_test_srv_crt_rsa[] = -"-----BEGIN CERTIFICATE-----\r\n" -"MIIDNzCCAh+gAwIBAgIBAjANBgkqhkiG9w0BAQUFADA7MQswCQYDVQQGEwJOTDER\r\n" -"MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN\r\n" -"MTEwMjEyMTQ0NDA2WhcNMjEwMjEyMTQ0NDA2WjA0MQswCQYDVQQGEwJOTDERMA8G\r\n" -"A1UEChMIUG9sYXJTU0wxEjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcN\r\n" -"AQEBBQADggEPADCCAQoCggEBAMFNo93nzR3RBNdJcriZrA545Do8Ss86ExbQWuTN\r\n" -"owCIp+4ea5anUrSQ7y1yej4kmvy2NKwk9XfgJmSMnLAofaHa6ozmyRyWvP7BBFKz\r\n" -"NtSj+uGxdtiQwWG0ZlI2oiZTqqt0Xgd9GYLbKtgfoNkNHC1JZvdbJXNG6AuKT2kM\r\n" -"tQCQ4dqCEGZ9rlQri2V5kaHiYcPNQEkI7mgM8YuG0ka/0LiqEQMef1aoGh5EGA8P\r\n" -"hYvai0Re4hjGYi/HZo36Xdh98yeJKQHFkA4/J/EwyEoO79bex8cna8cFPXrEAjya\r\n" -"HT4P6DSYW8tzS1KW2BGiLICIaTla0w+w3lkvEcf36hIBMJcCAwEAAaNNMEswCQYD\r\n" -"VR0TBAIwADAdBgNVHQ4EFgQUpQXoZLjc32APUBJNYKhkr02LQ5MwHwYDVR0jBBgw\r\n" -"FoAUtFrkpbPe0lL2udWmlQ/rPrzH/f8wDQYJKoZIhvcNAQEFBQADggEBAJxnXClY\r\n" -"oHkbp70cqBrsGXLybA74czbO5RdLEgFs7rHVS9r+c293luS/KdliLScZqAzYVylw\r\n" -"UfRWvKMoWhHYKp3dEIS4xTXk6/5zXxhv9Rw8SGc8qn6vITHk1S1mPevtekgasY5Y\r\n" -"iWQuM3h4YVlRH3HHEMAD1TnAexfXHHDFQGe+Bd1iAbz1/sH9H8l4StwX6egvTK3M\r\n" -"wXRwkKkvjKaEDA9ATbZx0mI8LGsxSuCqe9r9dyjmttd47J1p1Rulz3CLzaRcVIuS\r\n" -"RRQfaD8neM9c1S/iJ/amTVqJxA1KOdOS5780WhPfSArA+g4qAmSjelc3p4wWpha8\r\n" -"zhuYwjVuX6JHG0c=\r\n" -"-----END CERTIFICATE-----\r\n"; -const size_t mbedtls_test_srv_crt_rsa_len = sizeof( mbedtls_test_srv_crt_rsa ); - const char mbedtls_test_srv_key_rsa[] = "-----BEGIN RSA PRIVATE KEY-----\r\n" "MIIEpAIBAAKCAQEAwU2j3efNHdEE10lyuJmsDnjkOjxKzzoTFtBa5M2jAIin7h5r\r\n" diff --git a/dll/3rdparty/mbedtls/debug.c b/dll/3rdparty/mbedtls/debug.c index 92daafe9a87..c8c9f0976b2 100644 --- a/dll/3rdparty/mbedtls/debug.c +++ b/dll/3rdparty/mbedtls/debug.c @@ -88,8 +88,13 @@ void mbedtls_debug_print_msg( const mbedtls_ssl_context *ssl, int level, char str[DEBUG_BUF_SIZE]; int ret; - if( NULL == ssl || NULL == ssl->conf || NULL == ssl->conf->f_dbg || level > debug_threshold ) + if( NULL == ssl || + NULL == ssl->conf || + NULL == ssl->conf->f_dbg || + level > debug_threshold ) + { return; + } va_start( argp, format ); #if defined(_WIN32) @@ -123,8 +128,13 @@ void mbedtls_debug_print_ret( const mbedtls_ssl_context *ssl, int level, { char str[DEBUG_BUF_SIZE]; - if( ssl->conf == NULL || ssl->conf->f_dbg == NULL || level > debug_threshold ) + if( NULL == ssl || + NULL == ssl->conf || + NULL == ssl->conf->f_dbg || + level > debug_threshold ) + { return; + } /* * With non-blocking I/O and examples that just retry immediately, @@ -148,8 +158,13 @@ void mbedtls_debug_print_buf( const mbedtls_ssl_context *ssl, int level, char txt[17]; size_t i, idx = 0; - if( ssl->conf == NULL || ssl->conf->f_dbg == NULL || level > debug_threshold ) + if( NULL == ssl || + NULL == ssl->conf || + NULL == ssl->conf->f_dbg || + level > debug_threshold ) + { return; + } mbedtls_snprintf( str + idx, sizeof( str ) - idx, "dumping '%s' (%u bytes)\n", text, (unsigned int) len ); @@ -201,8 +216,13 @@ void mbedtls_debug_print_ecp( const mbedtls_ssl_context *ssl, int level, { char str[DEBUG_BUF_SIZE]; - if( ssl->conf == NULL || ssl->conf->f_dbg == NULL || level > debug_threshold ) + if( NULL == ssl || + NULL == ssl->conf || + NULL == ssl->conf->f_dbg || + level > debug_threshold ) + { return; + } mbedtls_snprintf( str, sizeof( str ), "%s(X)", text ); mbedtls_debug_print_mpi( ssl, level, file, line, str, &X->X ); @@ -221,8 +241,14 @@ void mbedtls_debug_print_mpi( const mbedtls_ssl_context *ssl, int level, int j, k, zeros = 1; size_t i, n, idx = 0; - if( ssl->conf == NULL || ssl->conf->f_dbg == NULL || X == NULL || level > debug_threshold ) + if( NULL == ssl || + NULL == ssl->conf || + NULL == ssl->conf->f_dbg || + NULL == X || + level > debug_threshold ) + { return; + } for( n = X->n - 1; n > 0; n-- ) if( X->p[n] != 0 ) @@ -347,8 +373,14 @@ void mbedtls_debug_print_crt( const mbedtls_ssl_context *ssl, int level, char str[DEBUG_BUF_SIZE]; int i = 0; - if( ssl->conf == NULL || ssl->conf->f_dbg == NULL || crt == NULL || level > debug_threshold ) + if( NULL == ssl || + NULL == ssl->conf || + NULL == ssl->conf->f_dbg || + NULL == crt || + level > debug_threshold ) + { return; + } while( crt != NULL ) { diff --git a/dll/3rdparty/mbedtls/ecdh.c b/dll/3rdparty/mbedtls/ecdh.c index 8056d090ebe..35eecf4ffae 100644 --- a/dll/3rdparty/mbedtls/ecdh.c +++ b/dll/3rdparty/mbedtls/ecdh.c @@ -181,8 +181,20 @@ int mbedtls_ecdh_get_params( mbedtls_ecdh_context *ctx, const mbedtls_ecp_keypai { int ret; - if( ( ret = mbedtls_ecp_group_copy( &ctx->grp, &key->grp ) ) != 0 ) - return( ret ); + if( ctx->grp.id == MBEDTLS_ECP_DP_NONE ) + { + /* This is the first call to get_params(). Copy the group information + * into the context. */ + if( ( ret = mbedtls_ecp_group_copy( &ctx->grp, &key->grp ) ) != 0 ) + return( ret ); + } + else + { + /* This is not the first call to get_params(). Check that the group + * is the same as the first time. */ + if( ctx->grp.id != key->grp.id ) + return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA ); + } /* If it's not our key, just import the public part as Qp */ if( side == MBEDTLS_ECDH_THEIRS ) diff --git a/dll/3rdparty/mbedtls/ssl_tls.c b/dll/3rdparty/mbedtls/ssl_tls.c index c588a97ba67..dde590af883 100644 --- a/dll/3rdparty/mbedtls/ssl_tls.c +++ b/dll/3rdparty/mbedtls/ssl_tls.c @@ -3704,81 +3704,23 @@ static int ssl_parse_record_header( mbedtls_ssl_context *ssl ) return( MBEDTLS_ERR_SSL_INVALID_RECORD ); } - /* Check length against bounds of the current transform and version */ - if( ssl->transform_in == NULL ) - { - if( ssl->in_msglen < 1 || - ssl->in_msglen > MBEDTLS_SSL_MAX_CONTENT_LEN ) - { - MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad message length" ) ); - return( MBEDTLS_ERR_SSL_INVALID_RECORD ); - } - } - else - { - if( ssl->in_msglen < ssl->transform_in->minlen ) - { - MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad message length" ) ); - return( MBEDTLS_ERR_SSL_INVALID_RECORD ); - } - -#if defined(MBEDTLS_SSL_PROTO_SSL3) - if( ssl->minor_ver == MBEDTLS_SSL_MINOR_VERSION_0 && - ssl->in_msglen > ssl->transform_in->minlen + MBEDTLS_SSL_MAX_CONTENT_LEN ) - { - MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad message length" ) ); - return( MBEDTLS_ERR_SSL_INVALID_RECORD ); - } -#endif -#if defined(MBEDTLS_SSL_PROTO_TLS1) || defined(MBEDTLS_SSL_PROTO_TLS1_1) || \ - defined(MBEDTLS_SSL_PROTO_TLS1_2) - /* - * TLS encrypted messages can have up to 256 bytes of padding - */ - if( ssl->minor_ver >= MBEDTLS_SSL_MINOR_VERSION_1 && - ssl->in_msglen > ssl->transform_in->minlen + - MBEDTLS_SSL_MAX_CONTENT_LEN + 256 ) - { - MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad message length" ) ); - return( MBEDTLS_ERR_SSL_INVALID_RECORD ); - } -#endif - } - /* - * DTLS-related tests done last, because most of them may result in - * silently dropping the record (but not the whole datagram), and we only - * want to consider that after ensuring that the "basic" fields (type, - * version, length) are sane. + * DTLS-related tests. + * Check epoch before checking length constraint because + * the latter varies with the epoch. E.g., if a ChangeCipherSpec + * message gets duplicated before the corresponding Finished message, + * the second ChangeCipherSpec should be discarded because it belongs + * to an old epoch, but not because its length is shorter than + * the minimum record length for packets using the new record transform. + * Note that these two kinds of failures are handled differently, + * as an unexpected record is silently skipped but an invalid + * record leads to the entire datagram being dropped. */ #if defined(MBEDTLS_SSL_PROTO_DTLS) if( ssl->conf->transport == MBEDTLS_SSL_TRANSPORT_DATAGRAM ) { unsigned int rec_epoch = ( ssl->in_ctr[0] << 8 ) | ssl->in_ctr[1]; - /* Drop unexpected ChangeCipherSpec messages */ - if( ssl->in_msgtype == MBEDTLS_SSL_MSG_CHANGE_CIPHER_SPEC && - ssl->state != MBEDTLS_SSL_CLIENT_CHANGE_CIPHER_SPEC && - ssl->state != MBEDTLS_SSL_SERVER_CHANGE_CIPHER_SPEC ) - { - MBEDTLS_SSL_DEBUG_MSG( 1, ( "dropping unexpected ChangeCipherSpec" ) ); - return( MBEDTLS_ERR_SSL_UNEXPECTED_RECORD ); - } - - /* Drop unexpected ApplicationData records, - * except at the beginning of renegotiations */ - if( ssl->in_msgtype == MBEDTLS_SSL_MSG_APPLICATION_DATA && - ssl->state != MBEDTLS_SSL_HANDSHAKE_OVER -#if defined(MBEDTLS_SSL_RENEGOTIATION) - && ! ( ssl->renego_status == MBEDTLS_SSL_RENEGOTIATION_IN_PROGRESS && - ssl->state == MBEDTLS_SSL_SERVER_HELLO ) -#endif - ) - { - MBEDTLS_SSL_DEBUG_MSG( 1, ( "dropping unexpected ApplicationData" ) ); - return( MBEDTLS_ERR_SSL_UNEXPECTED_RECORD ); - } - /* Check epoch (and sequence number) with DTLS */ if( rec_epoch != ssl->in_epoch ) { @@ -3818,9 +3760,74 @@ static int ssl_parse_record_header( mbedtls_ssl_context *ssl ) return( MBEDTLS_ERR_SSL_UNEXPECTED_RECORD ); } #endif + + /* Drop unexpected ChangeCipherSpec messages */ + if( ssl->in_msgtype == MBEDTLS_SSL_MSG_CHANGE_CIPHER_SPEC && + ssl->state != MBEDTLS_SSL_CLIENT_CHANGE_CIPHER_SPEC && + ssl->state != MBEDTLS_SSL_SERVER_CHANGE_CIPHER_SPEC ) + { + MBEDTLS_SSL_DEBUG_MSG( 1, ( "dropping unexpected ChangeCipherSpec" ) ); + return( MBEDTLS_ERR_SSL_UNEXPECTED_RECORD ); + } + + /* Drop unexpected ApplicationData records, + * except at the beginning of renegotiations */ + if( ssl->in_msgtype == MBEDTLS_SSL_MSG_APPLICATION_DATA && + ssl->state != MBEDTLS_SSL_HANDSHAKE_OVER +#if defined(MBEDTLS_SSL_RENEGOTIATION) + && ! ( ssl->renego_status == MBEDTLS_SSL_RENEGOTIATION_IN_PROGRESS && + ssl->state == MBEDTLS_SSL_SERVER_HELLO ) +#endif + ) + { + MBEDTLS_SSL_DEBUG_MSG( 1, ( "dropping unexpected ApplicationData" ) ); + return( MBEDTLS_ERR_SSL_UNEXPECTED_RECORD ); + } } #endif /* MBEDTLS_SSL_PROTO_DTLS */ + + /* Check length against bounds of the current transform and version */ + if( ssl->transform_in == NULL ) + { + if( ssl->in_msglen < 1 || + ssl->in_msglen > MBEDTLS_SSL_MAX_CONTENT_LEN ) + { + MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad message length" ) ); + return( MBEDTLS_ERR_SSL_INVALID_RECORD ); + } + } + else + { + if( ssl->in_msglen < ssl->transform_in->minlen ) + { + MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad message length" ) ); + return( MBEDTLS_ERR_SSL_INVALID_RECORD ); + } + +#if defined(MBEDTLS_SSL_PROTO_SSL3) + if( ssl->minor_ver == MBEDTLS_SSL_MINOR_VERSION_0 && + ssl->in_msglen > ssl->transform_in->minlen + MBEDTLS_SSL_MAX_CONTENT_LEN ) + { + MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad message length" ) ); + return( MBEDTLS_ERR_SSL_INVALID_RECORD ); + } +#endif +#if defined(MBEDTLS_SSL_PROTO_TLS1) || defined(MBEDTLS_SSL_PROTO_TLS1_1) || \ + defined(MBEDTLS_SSL_PROTO_TLS1_2) + /* + * TLS encrypted messages can have up to 256 bytes of padding + */ + if( ssl->minor_ver >= MBEDTLS_SSL_MINOR_VERSION_1 && + ssl->in_msglen > ssl->transform_in->minlen + + MBEDTLS_SSL_MAX_CONTENT_LEN + 256 ) + { + MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad message length" ) ); + return( MBEDTLS_ERR_SSL_INVALID_RECORD ); + } +#endif + } + return( 0 ); } diff --git a/dll/3rdparty/mbedtls/x509.c b/dll/3rdparty/mbedtls/x509.c index 08fc7ae9585..1d72bf49234 100644 --- a/dll/3rdparty/mbedtls/x509.c +++ b/dll/3rdparty/mbedtls/x509.c @@ -359,6 +359,8 @@ static int x509_get_attr_type_value( unsigned char **p, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 ) return( MBEDTLS_ERR_X509_INVALID_NAME + ret ); + end = *p + len; + if( ( end - *p ) < 1 ) return( MBEDTLS_ERR_X509_INVALID_NAME + MBEDTLS_ERR_ASN1_OUT_OF_DATA ); @@ -392,6 +394,12 @@ static int x509_get_attr_type_value( unsigned char **p, val->p = *p; *p += val->len; + if( *p != end ) + { + return( MBEDTLS_ERR_X509_INVALID_NAME + + MBEDTLS_ERR_ASN1_LENGTH_MISMATCH ); + } + cur->next = NULL; return( 0 ); @@ -698,30 +706,25 @@ int mbedtls_x509_get_sig_alg( const mbedtls_x509_buf *sig_oid, const mbedtls_x50 * be either manually updated or extensions should be parsed!) */ int mbedtls_x509_get_ext( unsigned char **p, const unsigned char *end, - mbedtls_x509_buf *ext, int tag ) + mbedtls_x509_buf *ext, int tag ) { int ret; size_t len; - if( *p == end ) - return( 0 ); - - ext->tag = **p; - - if( ( ret = mbedtls_asn1_get_tag( p, end, &ext->len, - MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | tag ) ) != 0 ) - return( ret ); + /* Extension structure use EXPLICIT tagging. That is, the actual + * `Extensions` structure is wrapped by a tag-length pair using + * the respective context-specific tag. */ + ret = mbedtls_asn1_get_tag( p, end, &ext->len, + MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | tag ); + if( ret != 0 ) + return( MBEDTLS_ERR_X509_INVALID_EXTENSIONS + ret ); - ext->p = *p; - end = *p + ext->len; + ext->tag = MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED | tag; + ext->p = *p; + end = *p + ext->len; /* * Extensions ::= SEQUENCE SIZE (1..MAX) OF Extension - * - * Extension ::= SEQUENCE { - * extnID OBJECT IDENTIFIER, - * critical BOOLEAN DEFAULT FALSE, - * extnValue OCTET STRING } */ if( ( ret = mbedtls_asn1_get_tag( p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE ) ) != 0 ) @@ -1034,8 +1037,8 @@ int mbedtls_x509_time_is_future( const mbedtls_x509_time *from ) */ int mbedtls_x509_self_test( int verbose ) { + int ret = 0; #if defined(MBEDTLS_CERTS_C) && defined(MBEDTLS_SHA256_C) - int ret; uint32_t flags; mbedtls_x509_crt cacert; mbedtls_x509_crt clicert; @@ -1043,6 +1046,7 @@ int mbedtls_x509_self_test( int verbose ) if( verbose != 0 ) mbedtls_printf( " X.509 certificate load: " ); + mbedtls_x509_crt_init( &cacert ); mbedtls_x509_crt_init( &clicert ); ret = mbedtls_x509_crt_parse( &clicert, (const unsigned char *) mbedtls_test_cli_crt, @@ -1052,11 +1056,9 @@ int mbedtls_x509_self_test( int verbose ) if( verbose != 0 ) mbedtls_printf( "failed\n" ); - return( ret ); + goto cleanup; } - mbedtls_x509_crt_init( &cacert ); - ret = mbedtls_x509_crt_parse( &cacert, (const unsigned char *) mbedtls_test_ca_crt, mbedtls_test_ca_crt_len ); if( ret != 0 ) @@ -1064,7 +1066,7 @@ int mbedtls_x509_self_test( int verbose ) if( verbose != 0 ) mbedtls_printf( "failed\n" ); - return( ret ); + goto cleanup; } if( verbose != 0 ) @@ -1076,20 +1078,19 @@ int mbedtls_x509_self_test( int verbose ) if( verbose != 0 ) mbedtls_printf( "failed\n" ); - return( ret ); + goto cleanup; } if( verbose != 0 ) mbedtls_printf( "passed\n\n"); +cleanup: mbedtls_x509_crt_free( &cacert ); mbedtls_x509_crt_free( &clicert ); - - return( 0 ); #else ((void) verbose); - return( 0 ); #endif /* MBEDTLS_CERTS_C && MBEDTLS_SHA1_C */ + return( ret ); } #endif /* MBEDTLS_SELF_TEST */ diff --git a/dll/3rdparty/mbedtls/x509_crl.c b/dll/3rdparty/mbedtls/x509_crl.c index 9e3bfda0668..89205590f96 100644 --- a/dll/3rdparty/mbedtls/x509_crl.c +++ b/dll/3rdparty/mbedtls/x509_crl.c @@ -109,17 +109,17 @@ static int x509_get_crl_ext( unsigned char **p, { int ret; + if( *p == end ) + return( 0 ); + /* * crlExtensions [0] EXPLICIT Extensions OPTIONAL * -- if present, version MUST be v2 */ if( ( ret = mbedtls_x509_get_ext( p, end, ext, 0 ) ) != 0 ) - { - if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG ) - return( 0 ); - return( ret ); - } + + end = ext->p + ext->len; while( *p < end ) { diff --git a/dll/3rdparty/mbedtls/x509_crt.c b/dll/3rdparty/mbedtls/x509_crt.c index 1a493ddcbba..77e6c2490a4 100644 --- a/dll/3rdparty/mbedtls/x509_crt.c +++ b/dll/3rdparty/mbedtls/x509_crt.c @@ -236,7 +236,7 @@ static int x509_get_version( unsigned char **p, return( 0 ); } - return( ret ); + return( MBEDTLS_ERR_X509_INVALID_FORMAT + ret ); } end = *p + len; @@ -303,7 +303,7 @@ static int x509_get_uid( unsigned char **p, if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG ) return( 0 ); - return( ret ); + return( MBEDTLS_ERR_X509_INVALID_FORMAT + ret ); } uid->p = *p; @@ -542,14 +542,13 @@ static int x509_get_crt_ext( unsigned char **p, size_t len; unsigned char *end_ext_data, *end_ext_octet; - if( ( ret = mbedtls_x509_get_ext( p, end, &crt->v3_ext, 3 ) ) != 0 ) - { - if( ret == MBEDTLS_ERR_ASN1_UNEXPECTED_TAG ) - return( 0 ); + if( *p == end ) + return( 0 ); + if( ( ret = mbedtls_x509_get_ext( p, end, &crt->v3_ext, 3 ) ) != 0 ) return( ret ); - } + end = crt->v3_ext.p + crt->v3_ext.len; while( *p < end ) { /* diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index c099f2f5af0..1f51414a5c0 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -87,7 +87,7 @@ Used Version: 4.0.10 Website: http://www.simplesystems.org/libtiff/ Title: mbed TLS -Used Version: 2.7.10 +Used Version: 2.7.11 Website: https://tls.mbed.org/ Title: libpng diff --git a/sdk/include/reactos/libs/mbedtls/config.h b/sdk/include/reactos/libs/mbedtls/config.h index b30a1a4e863..e00456228db 100644 --- a/sdk/include/reactos/libs/mbedtls/config.h +++ b/sdk/include/reactos/libs/mbedtls/config.h @@ -1897,9 +1897,7 @@ * * This module provides debugging functions. */ -#ifndef __REACTOS__ -#define MBEDTLS_DEBUG_C -#endif +//#define MBEDTLS_DEBUG_C /* swyter: we don't even need this level of verboseness, useful only when developing */ /** * \def MBEDTLS_DES_C diff --git a/sdk/include/reactos/libs/mbedtls/ssl.h b/sdk/include/reactos/libs/mbedtls/ssl.h index 01387777f8f..5df693a51ca 100644 --- a/sdk/include/reactos/libs/mbedtls/ssl.h +++ b/sdk/include/reactos/libs/mbedtls/ssl.h @@ -2108,12 +2108,27 @@ void mbedtls_ssl_conf_cert_req_ca_list( mbedtls_ssl_config *conf, #if defined(MBEDTLS_SSL_MAX_FRAGMENT_LENGTH) /** - * \brief Set the maximum fragment length to emit and/or negotiate - * (Default: MBEDTLS_SSL_MAX_CONTENT_LEN, usually 2^14 bytes) + * \brief Set the maximum fragment length to emit and/or negotiate. + * (Typical: #MBEDTLS_SSL_MAX_CONTENT_LEN, by default that is + * set to `2^14` bytes) * (Server: set maximum fragment length to emit, - * usually negotiated by the client during handshake + * usually negotiated by the client during handshake) * (Client: set maximum fragment length to emit *and* * negotiate with the server during handshake) + * (Default: #MBEDTLS_SSL_MAX_FRAG_LEN_NONE) + * + * \note With TLS, this currently only affects ApplicationData (sent + * with \c mbedtls_ssl_read()), not handshake messages. + * With DTLS, this affects both ApplicationData and handshake. + * + * \note On the client side, the maximum fragment length extension + * *will not* be used, unless the maximum fragment length has + * been set via this function to a value different than + * #MBEDTLS_SSL_MAX_FRAG_LEN_NONE. + * + * \note This sets the maximum length for a record's payload, + * excluding record overhead that will be added to it, see + * \c mbedtls_ssl_get_record_expansion(). * * \param conf SSL configuration * \param mfl_code Code for maximum fragment length (allowed values: diff --git a/sdk/include/reactos/libs/mbedtls/version.h b/sdk/include/reactos/libs/mbedtls/version.h index b0d49d21c4c..52a2e163410 100644 --- a/sdk/include/reactos/libs/mbedtls/version.h +++ b/sdk/include/reactos/libs/mbedtls/version.h @@ -42,16 +42,16 @@ */ #define MBEDTLS_VERSION_MAJOR 2 #define MBEDTLS_VERSION_MINOR 7 -#define MBEDTLS_VERSION_PATCH 10 +#define MBEDTLS_VERSION_PATCH 11 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define MBEDTLS_VERSION_NUMBER 0x02070A00 -#define MBEDTLS_VERSION_STRING "2.7.10" -#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.7.10" +#define MBEDTLS_VERSION_NUMBER 0x02070B00 +#define MBEDTLS_VERSION_STRING "2.7.11" +#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.7.11" #if defined(MBEDTLS_VERSION_C) diff --git a/sdk/include/reactos/libs/mbedtls/x509_crt.h b/sdk/include/reactos/libs/mbedtls/x509_crt.h index d2dd608f6e7..ff2bae4dbf2 100644 --- a/sdk/include/reactos/libs/mbedtls/x509_crt.h +++ b/sdk/include/reactos/libs/mbedtls/x509_crt.h @@ -100,7 +100,7 @@ mbedtls_x509_crt; * Build flag from an algorithm/curve identifier (pk, md, ecp) * Since 0 is always XXX_NONE, ignore it. */ -#define MBEDTLS_X509_ID_FLAG( id ) ( 1 << ( id - 1 ) ) +#define MBEDTLS_X509_ID_FLAG( id ) ( 1 << ( ( id ) - 1 ) ) /** * Security profile for certificate verification.

1 0

[reactos] 01/03: [DOC] Fix ACPICA version. CORE-16138
by Thomas Faber 27 Jun '19

27 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=132ca99397023a01a5f59… commit 132ca99397023a01a5f59addd82e3fcf400b101b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Jun 27 11:10:55 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Thu Jun 27 12:51:41 2019 +0200 [DOC] Fix ACPICA version. CORE-16138 --- media/doc/3rd Party Files.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index eae8f6caff3..c099f2f5af0 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -95,5 +95,5 @@ Used Version: 1.6.36 Website: http://libpng.sourceforge.net/ Title: ACPICA -Used Version: 20190329 +Used Version: 20190509 Website: https://acpica.org/

1 0

[reactos] 01/01: [ATL] Add CRect::PtInRect
by Mark Jansen 26 Jun '19

26 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58362b229b726030c3ef9… commit 58362b229b726030c3ef9a8360b860199530fa4e Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jun 1 13:53:04 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Jun 26 21:20:43 2019 +0200 [ATL] Add CRect::PtInRect --- sdk/lib/atl/atltypes.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdk/lib/atl/atltypes.h b/sdk/lib/atl/atltypes.h index f36f876af68..b79dcdb789c 100644 --- a/sdk/lib/atl/atltypes.h +++ b/sdk/lib/atl/atltypes.h @@ -380,7 +380,10 @@ public: ::OffsetRect(this, size.cx, size.cy); } - //BOOL PtInRect(POINT point) const throw() + BOOL PtInRect(POINT point) const throw() + { + return ::PtInRect(this, point); + } //void SetRect(int x1, int y1, int x2, int y2) throw() //void SetRectEmpty() throw() //CSize Size() const throw()

1 0

[reactos] 01/01: [NTOS:MM] Fix MiLocateKernelSections() and MmMakeKernelResourceSectionWritable().
by Hermès Bélusca-Maïto 25 Jun '19

25 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05616105a5e21eba598c8… commit 05616105a5e21eba598c8749cc95e55f3a64f154 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jun 26 00:46:52 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 26 00:57:53 2019 +0200 [NTOS:MM] Fix MiLocateKernelSections() and MmMakeKernelResourceSectionWritable(). - MiLocateKernelSections(): Fix the calculation of MiKernelResourceEndPte, MmPoolCodeEnd and MmPteCodeEnd. - MmMakeKernelResourceSectionWritable(): Fix PTE looping upper limit; use MI_MAKE_HARDWARE_PTE_KERNEL to build the updated read-write PTE. --- ntoskrnl/mm/ARM3/sysldr.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index 8b34fea69fb..036c38505d6 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -320,8 +320,9 @@ MmCallDllInitialize(IN PLDR_DATA_TABLE_ENTRY LdrEntry, "DllInitialize"); if (!DllInit) return STATUS_SUCCESS; - /* Do a temporary copy of BaseDllName called ImportName - * because we'll alter the length of the string + /* + * Do a temporary copy of BaseDllName called ImportName + * because we'll alter the length of the string. */ ImportName.Length = LdrEntry->BaseDllName.Length; ImportName.MaximumLength = LdrEntry->BaseDllName.MaximumLength; @@ -1077,7 +1078,7 @@ MiResolveImageReferences(IN PVOID ImageBase, GdiLink = GdiLink | !(_strnicmp(ImportName, "win32k", sizeof("win32k") - 1)); - /* We can also allow dxapi (for Windows compat, allow IRT and coverage )*/ + /* We can also allow dxapi (for Windows compat, allow IRT and coverage) */ NormalLink = NormalLink | ((_strnicmp(ImportName, "win32k", sizeof("win32k") - 1)) && (_strnicmp(ImportName, "dxapi", sizeof("dxapi") - 1)) && @@ -2149,8 +2150,8 @@ MiLocateKernelSections(IN PLDR_DATA_TABLE_ENTRY LdrEntry) SectionHeader = IMAGE_FIRST_SECTION(NtHeaders); /* Loop all the sections */ - Sections = NtHeaders->FileHeader.NumberOfSections; - while (Sections) + for (Sections = NtHeaders->FileHeader.NumberOfSections; + Sections > 0; --Sections, ++SectionHeader) { /* Grab the size of the section */ Size = max(SectionHeader->SizeOfRawData, SectionHeader->Misc.VirtualSize); @@ -2161,8 +2162,8 @@ MiLocateKernelSections(IN PLDR_DATA_TABLE_ENTRY LdrEntry) /* Remember the PTEs so we can modify them later */ MiKernelResourceStartPte = MiAddressToPte(DllBase + SectionHeader->VirtualAddress); - MiKernelResourceEndPte = MiKernelResourceStartPte + - BYTES_TO_PAGES(SectionHeader->VirtualAddress + Size); + MiKernelResourceEndPte = MiAddressToPte(ROUND_TO_PAGES(DllBase + + SectionHeader->VirtualAddress + Size)); } else if (*(PULONG)SectionHeader->Name == 'LOOP') { @@ -2177,20 +2178,16 @@ MiLocateKernelSections(IN PLDR_DATA_TABLE_ENTRY LdrEntry) { /* Found Mm* Pool code */ MmPoolCodeStart = DllBase + SectionHeader->VirtualAddress; - MmPoolCodeEnd = ExPoolCodeStart + Size; + MmPoolCodeEnd = MmPoolCodeStart + Size; } } else if ((*(PULONG)SectionHeader->Name == 'YSIM') && (*(PULONG)&SectionHeader->Name[4] == 'ETPS')) { - /* Found MISYSPTE (Mm System PTE code)*/ + /* Found MISYSPTE (Mm System PTE code) */ MmPteCodeStart = DllBase + SectionHeader->VirtualAddress; - MmPteCodeEnd = ExPoolCodeStart + Size; + MmPteCodeEnd = MmPteCodeStart + Size; } - - /* Keep going */ - Sections--; - SectionHeader++; } } @@ -2300,16 +2297,13 @@ MmMakeKernelResourceSectionWritable(VOID) return; /* Loop the PTEs */ - for (PointerPte = MiKernelResourceStartPte; PointerPte <= MiKernelResourceEndPte; PointerPte++) + for (PointerPte = MiKernelResourceStartPte; PointerPte < MiKernelResourceEndPte; ++PointerPte) { /* Read the PTE */ TempPte = *PointerPte; - /* Make sure it's valid */ - ASSERT(TempPte.u.Hard.Valid == 1); - /* Update the protection */ - MI_MAKE_WRITE_PAGE(&TempPte); + MI_MAKE_HARDWARE_PTE_KERNEL(&TempPte, PointerPte, MM_READWRITE, TempPte.u.Hard.PageFrameNumber); MI_UPDATE_VALID_PTE(PointerPte, TempPte); } @@ -2620,8 +2614,7 @@ MiEnablePagingOfDriver(IN PLDR_DATA_TABLE_ENTRY LdrEntry) { /* Nope, setup the first PTE address */ PointerPte = MiAddressToPte(ROUND_TO_PAGES(ImageBase + - Section-> - VirtualAddress)); + Section->VirtualAddress)); } /* Compute the size */ @@ -2630,9 +2623,7 @@ MiEnablePagingOfDriver(IN PLDR_DATA_TABLE_ENTRY LdrEntry) /* Find the last PTE that maps this section */ LastPte = MiAddressToPte(ImageBase + Section->VirtualAddress + - Alignment + - Size - - PAGE_SIZE); + Alignment + Size - PAGE_SIZE); } else {

1 0

[reactos] 01/01: [FREELDR] Fix Release build
by Victor Perevertkin 25 Jun '19

25 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12542f271dfdccf99dbdb… commit 12542f271dfdccf99dbdb49c25d8b32f83df47ed Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Wed Jun 26 00:56:21 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Wed Jun 26 00:56:21 2019 +0300 [FREELDR] Fix Release build --- boot/freeldr/freeldr/lib/mm/heap.c | 11 +++++++---- boot/freeldr/freeldr/lib/peloader.c | 18 ++++++++++++------ boot/freeldr/freeldr/ntldr/setupldr.c | 11 ++++++++--- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/boot/freeldr/freeldr/lib/mm/heap.c b/boot/freeldr/freeldr/lib/mm/heap.c index 236658a7e8e..0e45ba352da 100644 --- a/boot/freeldr/freeldr/lib/mm/heap.c +++ b/boot/freeldr/freeldr/lib/mm/heap.c @@ -184,7 +184,8 @@ FrLdrHeapRelease( PHEAP Heap = HeapHandle; PHEAP_BLOCK Block; PUCHAR StartAddress, EndAddress; - PFN_COUNT FreePages, AllPages, AllFreePages = 0; + PFN_COUNT FreePages, AllFreePages = 0; + TRACE("HeapRelease(%p)\n", HeapHandle); /* Loop all heap chunks */ @@ -240,13 +241,13 @@ FrLdrHeapRelease( if (Block->Size == 0) break; } - AllPages = Heap->MaximumSize / MM_PAGE_SIZE; - TRACE("HeapRelease() done, freed %lu of %lu pages\n", AllFreePages, AllPages); + TRACE("HeapRelease() done, freed %lu of %lu pages\n", AllFreePages, Heap->MaximumSize / MM_PAGE_SIZE); } VOID FrLdrHeapCleanupAll(VOID) { +#if DBG PHEAP Heap; Heap = FrLdrDefaultHeap; @@ -257,17 +258,19 @@ FrLdrHeapCleanupAll(VOID) Heap->NumAllocs, Heap->NumFrees); TRACE("AllocTime = %I64d, FreeTime = %I64d, sum = %I64d\n", Heap->AllocationTime, Heap->FreeTime, Heap->AllocationTime + Heap->FreeTime); - +#endif /* Release free pages from the default heap */ FrLdrHeapRelease(FrLdrDefaultHeap); +#if DBG Heap = FrLdrTempHeap; TRACE("Heap statistics for temp heap:\n" "CurrentAlloc=0x%lx, MaxAlloc=0x%lx, LargestAllocation=0x%lx\n" "NumAllocs=%ld, NumFrees=%ld\n", Heap->CurrentAllocBytes, Heap->MaxAllocBytes, Heap->LargestAllocation, Heap->NumAllocs, Heap->NumFrees); +#endif /* Destroy the temp heap */ FrLdrHeapDestroy(FrLdrTempHeap); diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 84eef62c252..ac61aba1a9f 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -112,6 +112,7 @@ WinLdrScanImportDescriptorTable(IN OUT PLIST_ENTRY ModuleListHead, ImportTable = (PIMAGE_IMPORT_DESCRIPTOR)RtlImageDirectoryEntryToData(VaToPa(ScanDTE->DllBase), TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &ImportTableSize); +#if DBG { UNICODE_STRING BaseName; BaseName.Buffer = VaToPa(ScanDTE->BaseDllName.Buffer); @@ -120,6 +121,7 @@ WinLdrScanImportDescriptorTable(IN OUT PLIST_ENTRY ModuleListHead, TRACE("WinLdrScanImportDescriptorTable(): %wZ ImportTable = 0x%X\n", &BaseName, ImportTable); } +#endif /* If image doesn't have any import directory - just return success */ if (ImportTable == NULL) @@ -456,17 +458,21 @@ WinLdrpCompareDllName(IN PCH DllName, IN PUNICODE_STRING UnicodeName) { PWSTR Buffer; - UNICODE_STRING UnicodeNamePA; SIZE_T i, Length; /* First obvious check: for length of two names */ Length = strlen(DllName); - UnicodeNamePA.Length = UnicodeName->Length; - UnicodeNamePA.MaximumLength = UnicodeName->MaximumLength; - UnicodeNamePA.Buffer = VaToPa(UnicodeName->Buffer); - TRACE("WinLdrpCompareDllName: %s and %wZ, Length = %d " - "UN->Length %d\n", DllName, &UnicodeNamePA, Length, UnicodeName->Length); +#if DBG + { + UNICODE_STRING UnicodeNamePA; + UnicodeNamePA.Length = UnicodeName->Length; + UnicodeNamePA.MaximumLength = UnicodeName->MaximumLength; + UnicodeNamePA.Buffer = VaToPa(UnicodeName->Buffer); + TRACE("WinLdrpCompareDllName: %s and %wZ, Length = %d " + "UN->Length %d\n", DllName, &UnicodeNamePA, Length, UnicodeName->Length); + } +#endif if ((Length * sizeof(WCHAR)) > UnicodeName->Length) return FALSE; diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index 111194acd03..10bfe3dff37 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -36,7 +36,6 @@ static VOID SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR SearchPath) { INFCONTEXT InfContext; - BOOLEAN Success; LPCSTR AnsiName, OemName, LangName; /* Get ANSI codepage file */ @@ -76,8 +75,14 @@ SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR TRACE("NLS data %s %s %s\n", AnsiName, OemName, LangName); - Success = WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); - TRACE("NLS data loading %s\n", Success ? "successful" : "failed"); +#if DBG + { + BOOLEAN Success = WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); + TRACE("NLS data loading %s\n", Success ? "successful" : "failed"); + } +#else + WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); +#endif /* TODO: Load OEM HAL font */ // Value "OemHalFont"

1 0

[reactos] 02/02: [NTOS:KE/MM] Some bug-fixes in the bugcheck code.
by Hermès Bélusca-Maïto 25 Jun '19

25 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f694d12f0c499819cba85… commit f694d12f0c499819cba854c51017f9c9242a03bd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jun 25 20:45:23 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jun 25 21:01:49 2019 +0200 [NTOS:KE/MM] Some bug-fixes in the bugcheck code. - Introduce the MmMakeKernelResourceSectionWritable() helper for making the kernel resource memory section writable, and use it in KeGetBugMessageText(). Indeed, this latter function patches in place the bugcheck resource message to trim any trailing newlines before displaying the message on screen. See also https://github.com/osresearch/uxen/blob/83bad53/dm/introspection-win7.c#L286 that mentions it too. This fixes bugcheck text display (e.g. the MANUALLY_INITIATED_CRASH one) when using (at least) MSVC-built ReactOS, avoiding a Page-Fault exception during the bugcheck. - Cover KeGetBugMessageText() in SEH since we are accessing kernel resources that could also be corrupted in bugcheck scenarii, and we don't want to further bugcheck. - Fix newline trimming loop. - KiDoBugCheckCallbacks(): * Wrap the bugcheck CallbackRoutine call in SEH. * Add a FIXME concerning the need of further memory validation of CurrentRecord. - Add a FIXME concerning the need to run the bugcheck-reason callbacks with the KbCallbackReserved1 reason, in KeBugCheckWithTf(). Mentioned in http://blog.ptsecurity.com/2012/06/customizing-blue-screen-of-death.html --- ntoskrnl/include/internal/mm.h | 6 ++- ntoskrnl/ke/bug.c | 88 ++++++++++++++++++++++++++++++------------ ntoskrnl/mm/ARM3/sysldr.c | 40 +++++++++++++++++++ 3 files changed, 108 insertions(+), 26 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index b4d7ad85bcc..da3a720d4dc 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -794,7 +794,7 @@ NTAPI MmDeleteKernelStack(PVOID Stack, BOOLEAN GuiStack); -/* balace.c ******************************************************************/ +/* balance.c *****************************************************************/ INIT_FUNCTION VOID @@ -1370,6 +1370,10 @@ MiInitializeLoadedModuleList( IN PLOADER_PARAMETER_BLOCK LoaderBlock ); +VOID +NTAPI +MmMakeKernelResourceSectionWritable(VOID); + NTSTATUS NTAPI MmLoadSystemImage( diff --git a/ntoskrnl/ke/bug.c b/ntoskrnl/ke/bug.c index f1e7a50376f..a92eb9297b9 100644 --- a/ntoskrnl/ke/bug.c +++ b/ntoskrnl/ke/bug.c @@ -406,47 +406,65 @@ NTAPI KeGetBugMessageText(IN ULONG BugCheckCode, OUT PANSI_STRING OutputString OPTIONAL) { - ULONG i, j; + ULONG i; ULONG IdOffset; - ULONG_PTR MessageEntry; + PMESSAGE_RESOURCE_ENTRY MessageEntry; PCHAR BugCode; - BOOLEAN Result = FALSE; USHORT Length; + BOOLEAN Result = FALSE; /* Make sure we're not bugchecking too early */ if (!KiBugCodeMessages) return Result; + /* + * Globally protect in SEH as we are trying to access data in + * dire situations, and potentially going to patch it (see below). + */ + _SEH2_TRY + { + + /* + * Make the kernel resource section writable, as we are going to manually + * trim the trailing newlines in the bugcheck resource message in place, + * when OutputString is NULL and before displaying it on screen. + */ + MmMakeKernelResourceSectionWritable(); + /* Find the message. This code is based on RtlFindMesssage */ for (i = 0; i < KiBugCodeMessages->NumberOfBlocks; i++) { - /* Check if the ID Matches */ + /* Check if the ID matches */ if ((BugCheckCode >= KiBugCodeMessages->Blocks[i].LowId) && (BugCheckCode <= KiBugCodeMessages->Blocks[i].HighId)) { - /* Get Offset to Entry */ - MessageEntry = KiBugCodeMessages->Blocks[i].OffsetToEntries + - (ULONG_PTR)KiBugCodeMessages; + /* Get offset to entry */ + MessageEntry = (PMESSAGE_RESOURCE_ENTRY) + ((ULONG_PTR)KiBugCodeMessages + KiBugCodeMessages->Blocks[i].OffsetToEntries); IdOffset = BugCheckCode - KiBugCodeMessages->Blocks[i].LowId; - /* Get offset to ID */ - for (j = 0; j < IdOffset; j++) + /* Advance in the entries until finding it */ + while (IdOffset--) { - /* Advance in the Entries */ - MessageEntry += ((PMESSAGE_RESOURCE_ENTRY)MessageEntry)-> - Length; + MessageEntry = (PMESSAGE_RESOURCE_ENTRY) + ((ULONG_PTR)MessageEntry + MessageEntry->Length); } - /* Get the final Code */ - BugCode = (PCHAR)((PMESSAGE_RESOURCE_ENTRY)MessageEntry)->Text; + /* Make sure it's not Unicode */ + ASSERT(!(MessageEntry->Flags & MESSAGE_RESOURCE_UNICODE)); + + /* Get the final code */ + BugCode = (PCHAR)MessageEntry->Text; Length = (USHORT)strlen(BugCode); /* Handle trailing newlines */ - while ((Length > 0) && ((BugCode[Length] == '\n') || - (BugCode[Length] == '\r') || - (BugCode[Length] == ANSI_NULL))) + while ((Length > 0) && ((BugCode[Length - 1] == '\n') || + (BugCode[Length - 1] == '\r') || + (BugCode[Length - 1] == ANSI_NULL))) { - /* Check if we have a string to return */ - if (!OutputString) BugCode[Length] = ANSI_NULL; + /* Directly trim the newline in place if we don't return the string */ + if (!OutputString) BugCode[Length - 1] = ANSI_NULL; + + /* Skip the trailing newline */ Length--; } @@ -455,12 +473,12 @@ KeGetBugMessageText(IN ULONG BugCheckCode, { /* Return it in the OutputString */ OutputString->Buffer = BugCode; - OutputString->Length = Length + 1; - OutputString->MaximumLength = Length + 1; + OutputString->Length = Length; + OutputString->MaximumLength = Length; } else { - /* Direct Output to Screen */ + /* Direct output to screen */ InbvDisplayString(BugCode); InbvDisplayString("\r"); } @@ -471,6 +489,12 @@ KeGetBugMessageText(IN ULONG BugCheckCode, } } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + /* Return the result */ return Result; } @@ -499,6 +523,8 @@ KiDoBugCheckCallbacks(VOID) Entry); /* Validate it */ + // TODO/FIXME: Check whether the memory CurrentRecord points to + // is still accessible and valid! if (CurrentRecord->Entry.Blink != LastEntry) return; Checksum = (ULONG_PTR)CurrentRecord->CallbackRoutine; Checksum += (ULONG_PTR)CurrentRecord->Buffer; @@ -511,9 +537,17 @@ KiDoBugCheckCallbacks(VOID) { /* Call the routine */ CurrentRecord->State = BufferStarted; - (CurrentRecord->CallbackRoutine)(CurrentRecord->Buffer, - CurrentRecord->Length); - CurrentRecord->State = BufferFinished; + _SEH2_TRY + { + (CurrentRecord->CallbackRoutine)(CurrentRecord->Buffer, + CurrentRecord->Length); + CurrentRecord->State = BufferFinished; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + CurrentRecord->State = BufferIncomplete; + } + _SEH2_END; } /* Go to the next entry */ @@ -1145,6 +1179,10 @@ KeBugCheckWithTf(IN ULONG BugCheckCode, HardErrMessage, AnsiName); + // TODO/FIXME: Run the registered reason-callbacks from + // the KeBugcheckReasonCallbackListHead list with the + // KbCallbackReserved1 reason. + /* Check if the debugger is disabled but we can enable it */ if (!(KdDebuggerEnabled) && !(KdPitchDebugger)) { diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index 640856620a7..8b34fea69fb 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -2284,6 +2284,46 @@ MiInitializeLoadedModuleList(IN PLOADER_PARAMETER_BLOCK LoaderBlock) return TRUE; } +VOID +NTAPI +MmMakeKernelResourceSectionWritable(VOID) +{ + PMMPTE PointerPte; + MMPTE TempPte; + + /* Don't do anything if the resource section is already writable */ + if (MiKernelResourceStartPte == NULL || MiKernelResourceEndPte == NULL) + return; + + /* If the resource section is physical, we cannot change its protection */ + if (MI_IS_PHYSICAL_ADDRESS(MiPteToAddress(MiKernelResourceStartPte))) + return; + + /* Loop the PTEs */ + for (PointerPte = MiKernelResourceStartPte; PointerPte <= MiKernelResourceEndPte; PointerPte++) + { + /* Read the PTE */ + TempPte = *PointerPte; + + /* Make sure it's valid */ + ASSERT(TempPte.u.Hard.Valid == 1); + + /* Update the protection */ + MI_MAKE_WRITE_PAGE(&TempPte); + MI_UPDATE_VALID_PTE(PointerPte, TempPte); + } + + /* + * Invalidate the cached resource section PTEs + * so as to not change its protection again later. + */ + MiKernelResourceStartPte = NULL; + MiKernelResourceEndPte = NULL; + + /* Only flush the current processor's TLB */ + KeFlushCurrentTb(); +} + LOGICAL NTAPI MiUseLargeDriverPage(IN ULONG NumberOfPtes,

1 0

[reactos] 01/02: [NTOS] Minor formatting enhancements only + typo fixes.
by Hermès Bélusca-Maïto 25 Jun '19

25 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35f800c6e2996cf0f519c… commit 35f800c6e2996cf0f519c24b7a1d00dc1d955f5f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jun 25 20:43:24 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jun 25 21:01:48 2019 +0200 [NTOS] Minor formatting enhancements only + typo fixes. --- ntoskrnl/ke/bug.c | 76 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/ntoskrnl/ke/bug.c b/ntoskrnl/ke/bug.c index 3208e6ba687..f1e7a50376f 100644 --- a/ntoskrnl/ke/bug.c +++ b/ntoskrnl/ke/bug.c @@ -483,42 +483,42 @@ KiDoBugCheckCallbacks(VOID) PLIST_ENTRY ListHead, NextEntry, LastEntry; ULONG_PTR Checksum; - /* First make sure that the list is Initialized... it might not be */ + /* First make sure that the list is initialized... it might not be */ ListHead = &KeBugcheckCallbackListHead; - if ((ListHead->Flink) && (ListHead->Blink)) + if ((!ListHead->Flink) || (!ListHead->Blink)) + return; + + /* Loop the list */ + LastEntry = ListHead; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) { - /* Loop the list */ - LastEntry = ListHead; - NextEntry = ListHead->Flink; - while (NextEntry != ListHead) + /* Get the reord */ + CurrentRecord = CONTAINING_RECORD(NextEntry, + KBUGCHECK_CALLBACK_RECORD, + Entry); + + /* Validate it */ + if (CurrentRecord->Entry.Blink != LastEntry) return; + Checksum = (ULONG_PTR)CurrentRecord->CallbackRoutine; + Checksum += (ULONG_PTR)CurrentRecord->Buffer; + Checksum += (ULONG_PTR)CurrentRecord->Length; + Checksum += (ULONG_PTR)CurrentRecord->Component; + + /* Make sure it's inserted and validated */ + if ((CurrentRecord->State == BufferInserted) && + (CurrentRecord->Checksum == Checksum)) { - /* Get the reord */ - CurrentRecord = CONTAINING_RECORD(NextEntry, - KBUGCHECK_CALLBACK_RECORD, - Entry); - - /* Validate it */ - if (CurrentRecord->Entry.Blink != LastEntry) return; - Checksum = (ULONG_PTR)CurrentRecord->CallbackRoutine; - Checksum += (ULONG_PTR)CurrentRecord->Buffer; - Checksum += (ULONG_PTR)CurrentRecord->Length; - Checksum += (ULONG_PTR)CurrentRecord->Component; - - /* Make sure it's inserted and valitdated */ - if ((CurrentRecord->State == BufferInserted) && - (CurrentRecord->Checksum == Checksum)) - { - /* Call the routine */ - CurrentRecord->State = BufferStarted; - (CurrentRecord->CallbackRoutine)(CurrentRecord->Buffer, - CurrentRecord->Length); - CurrentRecord->State = BufferFinished; - } - - /* Go to the next entry */ - LastEntry = NextEntry; - NextEntry = NextEntry->Flink; + /* Call the routine */ + CurrentRecord->State = BufferStarted; + (CurrentRecord->CallbackRoutine)(CurrentRecord->Buffer, + CurrentRecord->Length); + CurrentRecord->State = BufferFinished; } + + /* Go to the next entry */ + LastEntry = NextEntry; + NextEntry = NextEntry->Flink; } } @@ -856,7 +856,7 @@ KeBugCheckWithTf(IN ULONG BugCheckCode, case KERNEL_MODE_EXCEPTION_NOT_HANDLED: case ATTEMPTED_WRITE_TO_READONLY_MEMORY: case ATTEMPTED_EXECUTE_OF_NOEXECUTE_MEMORY: - + { /* Check if we have a trap frame */ if (!TrapFrame) { @@ -872,10 +872,11 @@ KeBugCheckWithTf(IN ULONG BugCheckCode, Pc = (PVOID)KeGetTrapFramePc(TrapFrame); } break; + } /* Wrong IRQL */ case IRQL_NOT_LESS_OR_EQUAL: - + { /* * The NT kernel has 3 special sections: * MISYSPTE, POOLMI and POOLCODE. The bug check code can @@ -933,10 +934,11 @@ KeBugCheckWithTf(IN ULONG BugCheckCode, /* Clear Pc so we don't look it up later */ Pc = NULL; break; + } /* Hard error */ case FATAL_UNHANDLED_HARD_ERROR: - + { /* Copy bug check data from hard error */ HardErrorParameters = (PULONG_PTR)BugCheckParameter2; KiBugCheckData[0] = BugCheckParameter1; @@ -950,10 +952,11 @@ KeBugCheckWithTf(IN ULONG BugCheckCode, HardErrCaption = (PCHAR)BugCheckParameter3; HardErrMessage = (PCHAR)BugCheckParameter4; break; + } /* Page fault */ case PAGE_FAULT_IN_NONPAGED_AREA: - + { /* Assume no driver */ DriverBase = NULL; @@ -1014,6 +1017,7 @@ KeBugCheckWithTf(IN ULONG BugCheckCode, } } break; + } /* Check if the driver forgot to unlock pages */ case DRIVER_LEFT_LOCKED_PAGES_IN_PROCESS:

1 0

[reactos] 01/01: [USBSTOR] Do not print device descriptor by default. Add SrbGetCdb macro
by Victor Perevertkin 25 Jun '19

25 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e831f8530ba6fb0d4e7a1… commit e831f8530ba6fb0d4e7a12b036fc218041084b22 Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Tue Jun 25 19:04:20 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Jun 25 19:04:20 2019 +0300 [USBSTOR] Do not print device descriptor by default. Add SrbGetCdb macro --- drivers/usb/usbstor/fdo.c | 36 ++++++++++++++++++++---------------- drivers/usb/usbstor/scsi.c | 26 +++++++++++--------------- drivers/usb/usbstor/usbstor.h | 4 ++++ 3 files changed, 35 insertions(+), 31 deletions(-) diff --git a/drivers/usb/usbstor/fdo.c b/drivers/usb/usbstor/fdo.c index a8a1a4d37b3..7b5dfc04c9f 100644 --- a/drivers/usb/usbstor/fdo.c +++ b/drivers/usb/usbstor/fdo.c @@ -14,25 +14,28 @@ #include <debug.h> +#if DBG +static VOID USBSTOR_DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor) { - DPRINT1("Dumping Device Descriptor %p\n", DeviceDescriptor); - DPRINT1("bLength %x\n", DeviceDescriptor->bLength); - DPRINT1("bDescriptorType %x\n", DeviceDescriptor->bDescriptorType); - DPRINT1("bcdUSB %x\n", DeviceDescriptor->bcdUSB); - DPRINT1("bDeviceClass %x\n", DeviceDescriptor->bDeviceClass); - DPRINT1("bDeviceSubClass %x\n", DeviceDescriptor->bDeviceSubClass); - DPRINT1("bDeviceProtocol %x\n", DeviceDescriptor->bDeviceProtocol); - DPRINT1("bMaxPacketSize0 %x\n", DeviceDescriptor->bMaxPacketSize0); - DPRINT1("idVendor %x\n", DeviceDescriptor->idVendor); - DPRINT1("idProduct %x\n", DeviceDescriptor->idProduct); - DPRINT1("bcdDevice %x\n", DeviceDescriptor->bcdDevice); - DPRINT1("iManufacturer %x\n", DeviceDescriptor->iManufacturer); - DPRINT1("iProduct %x\n", DeviceDescriptor->iProduct); - DPRINT1("iSerialNumber %x\n", DeviceDescriptor->iSerialNumber); - DPRINT1("bNumConfigurations %x\n", DeviceDescriptor->bNumConfigurations); + DPRINT("Dumping Device Descriptor %p\n", DeviceDescriptor); + DPRINT("bLength %x\n", DeviceDescriptor->bLength); + DPRINT("bDescriptorType %x\n", DeviceDescriptor->bDescriptorType); + DPRINT("bcdUSB %x\n", DeviceDescriptor->bcdUSB); + DPRINT("bDeviceClass %x\n", DeviceDescriptor->bDeviceClass); + DPRINT("bDeviceSubClass %x\n", DeviceDescriptor->bDeviceSubClass); + DPRINT("bDeviceProtocol %x\n", DeviceDescriptor->bDeviceProtocol); + DPRINT("bMaxPacketSize0 %x\n", DeviceDescriptor->bMaxPacketSize0); + DPRINT("idVendor %x\n", DeviceDescriptor->idVendor); + DPRINT("idProduct %x\n", DeviceDescriptor->idProduct); + DPRINT("bcdDevice %x\n", DeviceDescriptor->bcdDevice); + DPRINT("iManufacturer %x\n", DeviceDescriptor->iManufacturer); + DPRINT("iProduct %x\n", DeviceDescriptor->iProduct); + DPRINT("iSerialNumber %x\n", DeviceDescriptor->iSerialNumber); + DPRINT("bNumConfigurations %x\n", DeviceDescriptor->bNumConfigurations); } +#endif NTSTATUS USBSTOR_FdoHandleDeviceRelations( @@ -184,8 +187,9 @@ USBSTOR_FdoHandleStartDevice( return Status; } +#if DBG USBSTOR_DumpDeviceDescriptor(DeviceExtension->DeviceDescriptor); - +#endif // Check that this device uses bulk transfers and is SCSI diff --git a/drivers/usb/usbstor/scsi.c b/drivers/usb/usbstor/scsi.c index f917e0345e0..be27921bd3a 100644 --- a/drivers/usb/usbstor/scsi.c +++ b/drivers/usb/usbstor/scsi.c @@ -81,17 +81,17 @@ USBSTOR_IssueBulkOrInterruptRequest( Context->Urb.UrbBulkOrInterruptTransfer.TransferBuffer = TransferBuffer; Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferMDL = TransferBufferMDL; - NextStack = IoGetNextIrpStackLocation(Irp); - NextStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; - NextStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; - NextStack->Parameters.Others.Argument1 = &Context->Urb; + NextStack = IoGetNextIrpStackLocation(Irp); + NextStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + NextStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; + NextStack->Parameters.Others.Argument1 = &Context->Urb; IoSetCompletionRoutine(Irp, CompletionRoutine, Context, TRUE, TRUE, - TRUE); + TRUE); return IoCallDriver(FDODeviceExtension->LowerDeviceObject, Irp); } @@ -210,7 +210,7 @@ USBSTOR_CSWCompletionRoutine( DPRINT("USBSTOR_CSWCompletionRoutine: CSW_STATUS_COMMAND_FAILED\n"); ASSERT(FDODeviceExtension->ActiveSrb == Request); - + // setting a generic error status, additional information // should be read by higher-level driver from SenseInfoBuffer Request->SrbStatus = SRB_STATUS_ERROR; @@ -410,7 +410,7 @@ USBSTOR_CBWCompletionRoutine( FALSE, FALSE, NULL); - + if (Mdl) { IoBuildPartialMdl(Irp->MdlAddress, @@ -526,7 +526,6 @@ USBSTOR_IssueRequestSense( PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK CurrentSrb; PSCSI_REQUEST_BLOCK SenseSrb; - PCDB pCDB; DPRINT("USBSTOR_IssueRequestSense: \n"); @@ -551,9 +550,8 @@ USBSTOR_IssueRequestSense( SenseSrb->DataTransferLength = CurrentSrb->SenseInfoBufferLength; SenseSrb->DataBuffer = CurrentSrb->SenseInfoBuffer; - pCDB = (PCDB)SenseSrb->Cdb; - pCDB->CDB6GENERIC.OperationCode = SCSIOP_REQUEST_SENSE; - pCDB->AsByte[4] = CurrentSrb->SenseInfoBufferLength; + SrbGetCdb(SenseSrb)->CDB6GENERIC.OperationCode = SCSIOP_REQUEST_SENSE; + SrbGetCdb(SenseSrb)->AsByte[4] = CurrentSrb->SenseInfoBufferLength; return USBSTOR_SendCBWRequest(FDODeviceExtension, Irp, Context); } @@ -563,7 +561,6 @@ USBSTOR_HandleExecuteSCSI( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PCDB pCDB; NTSTATUS Status; PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK Request; @@ -575,12 +572,11 @@ USBSTOR_HandleExecuteSCSI( IoStack = IoGetCurrentIrpStackLocation(Irp); Request = IoStack->Parameters.Scsi.Srb; - pCDB = (PCDB)Request->Cdb; - DPRINT("USBSTOR_HandleExecuteSCSI Operation Code %x, Length %lu\n", pCDB->CDB10.OperationCode, Request->DataTransferLength); + DPRINT("USBSTOR_HandleExecuteSCSI Operation Code %x, Length %lu\n", SrbGetCdb(Request)->CDB10.OperationCode, Request->DataTransferLength); // check that we're sending to the right LUN - ASSERT(pCDB->CDB10.LogicalUnitNumber == (PDODeviceExtension->LUN & MAX_LUN)); + ASSERT(SrbGetCdb(Request)->CDB10.LogicalUnitNumber == (PDODeviceExtension->LUN & MAX_LUN)); Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(IRP_CONTEXT), USB_STOR_TAG); if (!Context) diff --git a/drivers/usb/usbstor/usbstor.h b/drivers/usb/usbstor/usbstor.h index 9fc3101ef2c..16bd314b56c 100644 --- a/drivers/usb/usbstor/usbstor.h +++ b/drivers/usb/usbstor/usbstor.h @@ -29,6 +29,10 @@ #define BooleanFlagOn(Flags, SingleFlag) ((BOOLEAN)((((Flags) & (SingleFlag)) != 0))) #endif +#ifndef SrbGetCdb +#define SrbGetCdb(srb) ((PCDB)(srb->Cdb)) +#endif + #define USB_RECOVERABLE_ERRORS (USBD_STATUS_STALL_PID | USBD_STATUS_DEV_NOT_RESPONDING \ | USBD_STATUS_ENDPOINT_HALTED | USBD_STATUS_NO_BANDWIDTH)

1 0

[reactos] 02/02: [USBOHCI_NEW] Rename counter-intuitive field of Transfer Descriptor
by Victor Perevertkin 25 Jun '19

25 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10260f40d934f878ded6c… commit 10260f40d934f878ded6c87a941ac53463fe5e2f Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Tue Jun 25 15:14:21 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Jun 25 15:14:21 2019 +0300 [USBOHCI_NEW] Rename counter-intuitive field of Transfer Descriptor --- drivers/usb/usbohci_new/usbohci.c | 28 ++++++++++++++-------------- drivers/usb/usbohci_new/usbohci.h | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/usb/usbohci_new/usbohci.c b/drivers/usb/usbohci_new/usbohci.c index 6216f80b75f..b68cc4081cc 100644 --- a/drivers/usb/usbohci_new/usbohci.c +++ b/drivers/usb/usbohci_new/usbohci.c @@ -71,7 +71,7 @@ if (TD->HwTD.SetupPacket.wLength) DPRINT("PhysicalAddress - %p\n", TD->PhysicalAddress); DPRINT("Flags - %X\n", TD->Flags); DPRINT("OhciTransfer - %08X\n", TD->OhciTransfer); - DPRINT("NextHcdTD - %08X\n", TD->NextHcdTD); + DPRINT("NextTDVa - %08X\n", TD->NextTDVa); if (TD->TransferLen) DPRINT("TransferLen - %X\n", TD->TransferLen); } @@ -1331,7 +1331,7 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, TD->OhciTransfer = OhciTransfer; PrevTD->HwTD.gTD.NextTD = TD->PhysicalAddress; - PrevTD->NextHcdTD = TD; + PrevTD->NextTDVa = TD; /* The first data packet should use DATA1, subsequent ones use DATA0 (OpenHCI spec, 4.3.1.3.4) */ DataToggle = OHCI_TD_DATA_TOGGLE_DATA1; @@ -1364,7 +1364,7 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, TD->OhciTransfer = OhciTransfer; PrevTD->HwTD.gTD.NextTD = TD->PhysicalAddress; - PrevTD->NextHcdTD = TD; + PrevTD->NextTDVa = TD; DataToggle = OHCI_TD_DATA_TOGGLE_DATA0; } @@ -1405,9 +1405,9 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, TD = OHCI_AllocateTD(OhciExtension, OhciEndpoint); PrevTD->HwTD.gTD.NextTD = TD->PhysicalAddress; - PrevTD->NextHcdTD = TD; + PrevTD->NextTDVa = TD; - TD->NextHcdTD = 0; + TD->NextTDVa = NULL; /* TD->HwTD.gTD.NextTD = 0; */ OhciTransfer->NextTD = TD; @@ -1483,7 +1483,7 @@ OHCI_BulkOrInterruptTransfer(IN POHCI_EXTENSION OhciExtension, OhciTransfer->PendingTDs++; PrevTD->HwTD.gTD.NextTD = TD->PhysicalAddress; - PrevTD->NextHcdTD = TD; + PrevTD->NextTDVa = TD; } while (TransferedLen < TransferParameters->TransferBufferLength); @@ -1499,7 +1499,7 @@ OHCI_BulkOrInterruptTransfer(IN POHCI_EXTENSION OhciExtension, * so it will be used for chaining a next transfer to it (OpenHCI spec, 4.6) */ /* TD->HwTD.gTD.NextTD = 0; */ - TD->NextHcdTD = 0; + TD->NextTDVa = NULL; OhciTransfer->NextTD = TD; OhciEndpoint->HcdTailP = TD; @@ -1735,7 +1735,7 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, if (TD->OhciTransfer == ohciTransfer) { PrevTD = TD; - TD = TD->NextHcdTD; + TD = TD->NextTDVa; if (PrevTD == OhciEndpoint->HcdHeadP) OhciEndpoint->HcdHeadP = TD; @@ -1749,7 +1749,7 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, } else { - TD = TD->NextHcdTD; + TD = TD->NextTDVa; } } while (TD != NextTD); @@ -1771,7 +1771,7 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, LastTD = TD; - TD = TD->NextHcdTD; + TD = TD->NextTDVa; } TD = td; @@ -1782,7 +1782,7 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, break; PrevTD = TD; - TD = TD->NextHcdTD; + TD = TD->NextTDVa; if (IsIsoEndpoint) OHCI_ProcessDoneIsoTD(OhciExtension, PrevTD, FALSE); @@ -1794,7 +1794,7 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, TmpTransfer = LastTD->OhciTransfer; TmpTransfer->NextTD = TD; - LastTD->NextHcdTD = TD; + LastTD->NextTDVa = TD; LastTD->HwTD.gTD.NextTD = TD->PhysicalAddress; } @@ -1955,7 +1955,7 @@ OHCI_PollAsyncEndpoint(IN POHCI_EXTENSION OhciExtension, IsResetOnHalt = (ED->Flags & OHCI_HCD_ED_FLAG_RESET_ON_HALT) != 0; DPRINT1("PollAsyncEndpoint: IsResetOnHalt %x\n", IsResetOnHalt); - for (TD = OhciEndpoint->HcdHeadP; ; TD = TD->NextHcdTD) + for (TD = OhciEndpoint->HcdHeadP; ; TD = TD->NextTDVa) { if (!TD) { @@ -2075,7 +2075,7 @@ ProcessListTDs: OHCI_DumpHcdTD(TD); TD->Flags |= OHCI_HCD_TD_FLAG_DONE; InsertTailList(&OhciEndpoint->TDList, &TD->DoneLink); - TD = TD->NextHcdTD; + TD = TD->NextTDVa; } HandleDoneList: diff --git a/drivers/usb/usbohci_new/usbohci.h b/drivers/usb/usbohci_new/usbohci.h index 7e52959376d..735a9b7d787 100644 --- a/drivers/usb/usbohci_new/usbohci.h +++ b/drivers/usb/usbohci_new/usbohci.h @@ -66,7 +66,7 @@ typedef struct _OHCI_HCD_TD { ULONG PhysicalAddress; ULONG Flags; POHCI_TRANSFER OhciTransfer; - struct _OHCI_HCD_TD *NextHcdTD; + struct _OHCI_HCD_TD *NextTDVa; ULONG TransferLen; LIST_ENTRY DoneLink; ULONG Pad[1];

1 0

[reactos] 01/02: [USBOHCI_NEW] Zero out the transfer descriptor right after allocation. Cleaned up transfer routines and added some more docs.
by Victor Perevertkin 25 Jun '19

25 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9004e64b574adc8a57587… commit 9004e64b574adc8a575870f2faadd400cac21201 Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Tue Jun 25 15:03:26 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Tue Jun 25 15:03:26 2019 +0300 [USBOHCI_NEW] Zero out the transfer descriptor right after allocation. Cleaned up transfer routines and added some more docs. --- drivers/usb/usbohci_new/usbohci.c | 178 +++++++++++++------------------------- 1 file changed, 61 insertions(+), 117 deletions(-) diff --git a/drivers/usb/usbohci_new/usbohci.c b/drivers/usb/usbohci_new/usbohci.c index 8e05468ef44..6216f80b75f 100644 --- a/drivers/usb/usbohci_new/usbohci.c +++ b/drivers/usb/usbohci_new/usbohci.c @@ -1246,6 +1246,8 @@ OHCI_AllocateTD(IN POHCI_EXTENSION OhciExtension, TD->Flags |= OHCI_HCD_TD_FLAG_ALLOCATED; + RtlSecureZeroMemory(&TD->HwTD, sizeof(TD->HwTD)); + return TD; } @@ -1277,23 +1279,19 @@ OHCI_RemainTDs(IN POHCI_EXTENSION OhciExtension, return RemainTDs; } +static MPSTATUS -NTAPI OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, IN POHCI_ENDPOINT OhciEndpoint, IN PUSBPORT_TRANSFER_PARAMETERS TransferParameters, IN POHCI_TRANSFER OhciTransfer, IN PUSBPORT_SCATTER_GATHER_LIST SGList) { - POHCI_HCD_TD FirstTD; - ULONG FirstTdPA; + POHCI_HCD_TD SetupTD; POHCI_HCD_TD TD; - POHCI_HCD_TD TD2; POHCI_HCD_TD PrevTD; - POHCI_HCD_TD NextTD; ULONG MaxTDs; ULONG TransferedLen; - ULONG BufferEnd; UCHAR DataToggle; DPRINT_OHCI("OHCI_ControlTransfer: Ext %p, Endpoint %p\n", @@ -1305,65 +1303,39 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, if ((SGList->SgElementCount + OHCI_NON_DATA_CONTROL_TDS) > MaxTDs) return MP_STATUS_FAILURE; - FirstTD = OhciEndpoint->HcdTailP; - FirstTD->HwTD.gTD.Control.DelayInterrupt = OHCI_TD_INTERRUPT_NONE; + /* Form a setup packet first */ + SetupTD = OhciEndpoint->HcdTailP; + RtlSecureZeroMemory(&SetupTD->HwTD, sizeof(SetupTD->HwTD)); - FirstTD->HwTD.gTD.NextTD = 0; - FirstTD->HwTD.gTD.CurrentBuffer = 0; - FirstTD->HwTD.gTD.BufferEnd = 0; - - FirstTD->Flags |= OHCI_HCD_TD_FLAG_PROCESSED; - FirstTD->NextHcdTD = 0; - FirstTD->OhciTransfer = OhciTransfer; - - FirstTD->HwTD.Padded[0] = 0; - FirstTD->HwTD.Padded[1] = 0; + SetupTD->Flags |= OHCI_HCD_TD_FLAG_PROCESSED; + SetupTD->OhciTransfer = OhciTransfer; OhciTransfer->PendingTDs++; - RtlCopyMemory(&FirstTD->HwTD.SetupPacket, + RtlCopyMemory(&SetupTD->HwTD.SetupPacket, &TransferParameters->SetupPacket, - sizeof(FirstTD->HwTD.SetupPacket)); - - FirstTdPA = FirstTD->PhysicalAddress; - - FirstTD->HwTD.gTD.CurrentBuffer = FirstTdPA + FIELD_OFFSET(OHCI_HCD_TD, HwTD.SetupPacket); + sizeof(SetupTD->HwTD.SetupPacket)); - BufferEnd = FirstTdPA + FIELD_OFFSET(OHCI_HCD_TD, HwTD.SetupPacket) + - sizeof(USB_DEFAULT_PIPE_SETUP_PACKET) - 1; + SetupTD->HwTD.gTD.CurrentBuffer = SetupTD->PhysicalAddress + FIELD_OFFSET(OHCI_HCD_TD, HwTD.SetupPacket); + SetupTD->HwTD.gTD.BufferEnd = SetupTD->PhysicalAddress + FIELD_OFFSET(OHCI_HCD_TD, HwTD.SetupPacket) + + sizeof(USB_DEFAULT_PIPE_SETUP_PACKET) - 1; + SetupTD->HwTD.gTD.Control.DelayInterrupt = OHCI_TD_INTERRUPT_NONE; + SetupTD->HwTD.gTD.Control.ConditionCode = OHCI_TD_CONDITION_NOT_ACCESSED; + SetupTD->HwTD.gTD.Control.DataToggle = OHCI_TD_DATA_TOGGLE_DATA0; - FirstTD->HwTD.gTD.BufferEnd = BufferEnd; + PrevTD = SetupTD; - FirstTD->HwTD.gTD.Control.AsULONG = 0; - FirstTD->HwTD.gTD.Control.DelayInterrupt = OHCI_TD_INTERRUPT_NONE; - FirstTD->HwTD.gTD.Control.ConditionCode = OHCI_TD_CONDITION_NOT_ACCESSED; - FirstTD->HwTD.gTD.Control.DataToggle = OHCI_TD_DATA_TOGGLE_DATA0; + /* Data packets follow a setup packet (if any) */ + TD = OHCI_AllocateTD(OhciExtension, OhciEndpoint); + TD->Flags |= OHCI_HCD_TD_FLAG_PROCESSED; + TD->OhciTransfer = OhciTransfer; - TD2 = OHCI_AllocateTD(OhciExtension, OhciEndpoint); - - TD2->HwTD.gTD.Control.DelayInterrupt = OHCI_TD_INTERRUPT_NONE; - TD2->HwTD.gTD.CurrentBuffer = 0; - TD2->HwTD.gTD.BufferEnd = 0; - TD2->HwTD.gTD.NextTD = 0; - - TD2->Flags |= OHCI_HCD_TD_FLAG_PROCESSED; - TD2->NextHcdTD = 0; - TD2->OhciTransfer = OhciTransfer; - - RtlZeroMemory(&TD2->HwTD.SetupPacket, - sizeof(TD2->HwTD.SetupPacket)); - - TD2->HwTD.Padded[0] = 0; - TD2->HwTD.Padded[1] = 0; - - PrevTD = FirstTD; - TD = TD2; - - PrevTD->HwTD.gTD.NextTD = TD2->PhysicalAddress; - PrevTD->NextHcdTD = TD2; + PrevTD->HwTD.gTD.NextTD = TD->PhysicalAddress; + PrevTD->NextHcdTD = TD; - TransferedLen = 0; + /* The first data packet should use DATA1, subsequent ones use DATA0 (OpenHCI spec, 4.3.1.3.4) */ DataToggle = OHCI_TD_DATA_TOGGLE_DATA1; + TransferedLen = 0; while (TransferedLen < TransferParameters->TransferBufferLength) { @@ -1375,10 +1347,8 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, TD->HwTD.gTD.Control.DirectionPID = OHCI_TD_DIRECTION_PID_OUT; TD->HwTD.gTD.Control.DelayInterrupt = OHCI_TD_INTERRUPT_NONE; - TD->HwTD.gTD.Control.DataToggle = DataToggle; TD->HwTD.gTD.Control.ConditionCode = OHCI_TD_CONDITION_NOT_ACCESSED; - - DataToggle = OHCI_TD_DATA_TOGGLE_FROM_ED; + TD->HwTD.gTD.Control.DataToggle = DataToggle; TransferedLen = OHCI_MapTransferToTD(OhciExtension, TransferedLen, @@ -1389,26 +1359,14 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, PrevTD = TD; TD = OHCI_AllocateTD(OhciExtension, OhciEndpoint); - - TD->Flags |= OHCI_HCD_TD_FLAG_PROCESSED; - - TD->HwTD.gTD.NextTD = 0; TD->HwTD.gTD.Control.DelayInterrupt = OHCI_TD_INTERRUPT_NONE; - - TD->NextHcdTD = 0; + TD->Flags |= OHCI_HCD_TD_FLAG_PROCESSED; TD->OhciTransfer = OhciTransfer; - TD->HwTD.gTD.CurrentBuffer = 0; - TD->HwTD.gTD.BufferEnd = 0; - - RtlZeroMemory(&TD->HwTD.SetupPacket, - sizeof(TD->HwTD.SetupPacket)); - - TD->HwTD.Padded[0] = 0; - TD->HwTD.Padded[1] = 0; - PrevTD->HwTD.gTD.NextTD = TD->PhysicalAddress; PrevTD->NextHcdTD = TD; + + DataToggle = OHCI_TD_DATA_TOGGLE_DATA0; } if (TransferParameters->TransferFlags & USBD_SHORT_TRANSFER_OK) @@ -1417,16 +1375,14 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, OhciTransfer->Flags |= OHCI_TRANSFER_FLAGS_SHORT_TRANSFER_OK; } - TD->HwTD.gTD.CurrentBuffer = 0; - TD->HwTD.gTD.BufferEnd = 0; + /* After data packets, goes a status packet */ TD->Flags |= OHCI_HCD_TD_FLAG_CONTROL_STATUS; TD->TransferLen = 0; - TD->HwTD.gTD.Control.AsULONG = 0; - if ((TransferParameters->TransferFlags & USBD_TRANSFER_DIRECTION_IN) != 0) { + TD->HwTD.gTD.Control.BufferRounding = FALSE; TD->HwTD.gTD.Control.DirectionPID = OHCI_TD_DIRECTION_PID_OUT; } else @@ -1435,44 +1391,37 @@ OHCI_ControlTransfer(IN POHCI_EXTENSION OhciExtension, TD->HwTD.gTD.Control.DirectionPID = OHCI_TD_DIRECTION_PID_IN; } + /* OpenHCI spec, 4.3.1.3.4 */ TD->HwTD.gTD.Control.DataToggle = OHCI_TD_DATA_TOGGLE_DATA1; TD->HwTD.gTD.Control.ConditionCode = OHCI_TD_CONDITION_NOT_ACCESSED; + TD->HwTD.gTD.Control.DelayInterrupt = OHCI_TD_INTERRUPT_IMMEDIATE; OhciTransfer->PendingTDs++; OhciTransfer->ControlStatusTD = TD; - NextTD = OHCI_AllocateTD(OhciExtension, OhciEndpoint); + PrevTD = TD; - TD->HwTD.gTD.NextTD = NextTD->PhysicalAddress; - TD->NextHcdTD = NextTD; + /* And the last descriptor, which is not used in the current transfer (OpenHCI spec, 4.6) */ + TD = OHCI_AllocateTD(OhciExtension, OhciEndpoint); - NextTD->NextHcdTD = 0; - NextTD->HwTD.gTD.NextTD = 0; + PrevTD->HwTD.gTD.NextTD = TD->PhysicalAddress; + PrevTD->NextHcdTD = TD; - OhciTransfer->NextTD = NextTD; - OhciEndpoint->HcdTailP = NextTD; + TD->NextHcdTD = 0; + /* TD->HwTD.gTD.NextTD = 0; */ - OhciEndpoint->HcdED->HwED.TailPointer = NextTD->PhysicalAddress; + OhciTransfer->NextTD = TD; + OhciEndpoint->HcdTailP = TD; + + OhciEndpoint->HcdED->HwED.TailPointer = TD->PhysicalAddress; OHCI_EnableList(OhciExtension, OhciEndpoint); return MP_STATUS_SUCCESS; } -/** - * @brief Creates the transfer descriptor chain for the given transfer's buffer - * and attaches it to a given endpoint (for bulk or interrupt transfers) - * - * @param[in] OhciExtension The ohci extension - * @param[in] OhciEndpoint The ohci endpoint - * @param[in] TransferParameters The transfer parameters - * @param[in] OhciTransfer The ohci transfer - * @param[in] SGList The scatter/gather list - * - * @return MP_STATUS_SUCCESS or MP_STATUS_FAILURE if there are not enough TDs left - */ +static MPSTATUS -NTAPI OHCI_BulkOrInterruptTransfer(IN POHCI_EXTENSION OhciExtension, IN POHCI_ENDPOINT OhciEndpoint, IN PUSBPORT_TRANSFER_PARAMETERS TransferParameters, @@ -1497,13 +1446,12 @@ OHCI_BulkOrInterruptTransfer(IN POHCI_EXTENSION OhciExtension, do { - TD->HwTD.gTD.Control.AsULONG = 0; TD->HwTD.gTD.Control.DelayInterrupt = OHCI_TD_INTERRUPT_NONE; TD->HwTD.gTD.Control.ConditionCode = OHCI_TD_CONDITION_NOT_ACCESSED; if (TransferParameters->TransferFlags & USBD_TRANSFER_DIRECTION_IN) { - TD->HwTD.gTD.Control.BufferRounding = 0; + TD->HwTD.gTD.Control.BufferRounding = FALSE; TD->HwTD.gTD.Control.DirectionPID = OHCI_TD_DIRECTION_PID_IN; } else @@ -1512,19 +1460,8 @@ OHCI_BulkOrInterruptTransfer(IN POHCI_EXTENSION OhciExtension, TD->HwTD.gTD.Control.DirectionPID = OHCI_TD_DIRECTION_PID_OUT; } - TD->HwTD.gTD.CurrentBuffer = 0; - TD->HwTD.gTD.NextTD = 0; - TD->HwTD.gTD.BufferEnd = 0; - - RtlZeroMemory(&TD->HwTD.SetupPacket, - sizeof(TD->HwTD.SetupPacket)); - - TD->HwTD.Padded[0] = 0; - TD->HwTD.Padded[1] = 0; - TD->Flags |= OHCI_HCD_TD_FLAG_PROCESSED; TD->OhciTransfer = OhciTransfer; - TD->NextHcdTD = 0; if (TransferParameters->TransferBufferLength) { @@ -1537,10 +1474,6 @@ OHCI_BulkOrInterruptTransfer(IN POHCI_EXTENSION OhciExtension, else { ASSERT(SGList->SgElementCount == 0); - - TD->HwTD.gTD.CurrentBuffer = 0; - TD->HwTD.gTD.BufferEnd = 0; - TD->TransferLen = 0; } @@ -1561,13 +1494,11 @@ OHCI_BulkOrInterruptTransfer(IN POHCI_EXTENSION OhciExtension, } PrevTD->HwTD.gTD.Control.DelayInterrupt = OHCI_TD_INTERRUPT_IMMEDIATE; - PrevTD->HwTD.gTD.NextTD = TD->PhysicalAddress; - PrevTD->NextHcdTD = TD; /* The last TD in a chain is not used in a transfer. The controller does not access it * so it will be used for chaining a next transfer to it (OpenHCI spec, 4.6) */ - TD->HwTD.gTD.NextTD = 0; + /* TD->HwTD.gTD.NextTD = 0; */ TD->NextHcdTD = 0; OhciTransfer->NextTD = TD; @@ -1580,6 +1511,19 @@ OHCI_BulkOrInterruptTransfer(IN POHCI_EXTENSION OhciExtension, return MP_STATUS_SUCCESS; } +/** + * @brief Creates the transfer descriptor chain for the given transfer's buffer + * and attaches it to a given endpoint (for control, bulk or interrupt transfers) + * + * @param[in] OhciExtension The ohci extension + * @param[in] OhciEndpoint The ohci endpoint + * @param[in] TransferParameters The transfer parameters + * @param[in] OhciTransfer The ohci transfer + * @param[in] SGList The scatter/gather list + * + * @return MP_STATUS_SUCCESS or MP_STATUS_FAILURE if there are not enough TDs left + * or wrong transfer type given + */ MPSTATUS NTAPI OHCI_SubmitTransfer(IN PVOID ohciExtension,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs