- openldap-bugs - openldap.org

Re: (ITS#8022) Backend Meta does not work with ssl-backends
by dirk.kastens＠uni-osnabrueck.de 12 Jan '15

12 Jan '15

This is a cryptographically signed message in MIME format. --------------ms020609010007010102020405 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: quoted-printable Hi, > Then you should have simply followed up to #7983. The case has been closed. > Does ldapsearch work against the target servers using the certificate > configurations you listed? Yes. I can directly query the target servers from the redhat server=20 using ldapsearch and ssl. --------------ms020609010007010102020405 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIPJDCC BCEwggMJoAMCAQICAgDHMA0GCSqGSIb3DQEBBQUAMHExCzAJBgNVBAYTAkRFMRwwGgYDVQQK ExNEZXV0c2NoZSBUZWxla29tIEFHMR8wHQYDVQQLExZULVRlbGVTZWMgVHJ1c3QgQ2VudGVy MSMwIQYDVQQDExpEZXV0c2NoZSBUZWxla29tIFJvb3QgQ0EgMjAeFw0wNjEyMTkxMDI5MDBa Fw0xOTA2MzAyMzU5MDBaMFoxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw DgYDVQQLEwdERk4tUEtJMSQwIgYDVQQDExtERk4tVmVyZWluIFBDQSBHbG9iYWwgLSBHMDEw ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDpm8NnhfkNrvWNVMOWUDU9YuluTO2U 1wBblSJ01CDrNI/W7MAxBAuZgeKmFNJSoCgjhIt0iQReW+DieMF4yxbLKDU5ey2QRdDtoAB6 fL9KDhsAw4bpXCsxEXsM84IkQ4wcOItqaACa7txPeKvSxhObdq3u3ibo7wGvdA/BCaL2a869 080UME/15eOkyGKbghoDJzANAmVgTe3RCSMqljVYJ9N2xnG2kB3E7f81hn1vM7PbD8URwoqD oZRdQWvY0hD1TP3KUazZve+Sg7va64sWVlZDz+HVEz2mHycwzUlU28kTNJpxdcVs6qcLmPkh nSevPqM5OUhqjK3JmfvDEvK9AgMBAAGjgdkwgdYwcAYDVR0fBGkwZzBloGOgYYZfaHR0cDov L3BraS50ZWxlc2VjLmRlL2NnaS1iaW4vc2VydmljZS9hZl9Eb3dubG9hZEFSTC5jcmw/LWNy bF9mb3JtYXQ9WF81MDkmLWlzc3Vlcj1EVF9ST09UX0NBXzIwHQYDVR0OBBYEFEm3xs/oPR9/ 6kR7Eyn38QpwPt5kMB8GA1UdIwQYMBaAFDHDeRu69VPXF+CJei0XbAqzK50zMA4GA1UdDwEB /wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgECMA0GCSqGSIb3DQEBBQUAA4IBAQA74Vp3wEgX 3KkY7IGvWonwvSiSpspZGBJw7Cjy565/lizn8l0ZMfYTK3S9vYCyufdnyTmieTvhERHua3iR M347XyYndVNljjNj7s9zw7CSI0khUHUjoR8Y4pSFPT8z6XcgjaK95qGFKUD2P3MyWA0Ja6ba hWzAP7uNZmRWJE6uDT8yNQFb6YyC2XJZT7GGhfF0hVblw/hc843uR7NTBXDn5U2KaYMo4RMJ hp5eyOpYHgwf+aTUWgRo/Sg+iwK2WLX2oSw3VwBnqyNojWOl75lrXP1LVvarQIc01BGSbOyH xQoLBzNytG8MHVQs2FHHzL8w00Ny8TK/jM5JY6gA9/IcMIIFcDCCBFigAwIBAgIHF6QkfFey qDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEQ MA4GA1UECxMHREZOLVBLSTEkMCIGA1UEAxMbREZOLVZlcmVpbiBQQ0EgR2xvYmFsIC0gRzAx MB4XDTE0MDUyNzE0NTMzM1oXDTE5MDcwOTIzNTkwMFowgZExCzAJBgNVBAYTAkRFMSAwHgYD VQQKExdVbml2ZXJzaXRhZXQgT3NuYWJydWVjazEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTEj MCEGA1UEAxMaVW5pLU9zbmFicnVlY2sgUlotQ0EgRy0wMDIxIzAhBgkqhkiG9w0BCQEWFGNh QHVuaS1vc25hYnJ1ZWNrLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApLZx V6i214uWBb3c16AMckkujPKMXxl9Z4XsEIhrA47tG5YL9upeUrj+duDcrbEQvphvSXJFveVk LK1JMANHJuu/Wa32Bc8IRljYBqhaKMTGRO1q5L6jkMBDwBwenozhlGAaqG+8Cy+qcFoUaoWB RCH2++t5FtXyS1/1GKhWu7yQxCblFul7VXvnLKyaNlOaTalREXb9pQk2N31+rrOgwkbogxc2 z30gQAJXeJ2Ra0SlReqINMmcDd4lfluXjBpFmiJa4xHhQIVJpW2vF8dbqmeKqxIoYziBh78N GaqMSC8IbDPbCM3qaDaGUWKccgb/SKZvrNTLU+jcW66yGi1YPwIDAQABo4ICATCCAf0wEgYD VR0TAQH/BAgwBgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwEQYDVR0gBAowCDAGBgRVHSAAMB0G A1UdDgQWBBSqH9h3FW6Z5F+Q1uxjJk4Z6mcUUDAfBgNVHSMEGDAWgBRJt8bP6D0ff+pEexMp 9/EKcD7eZDAfBgNVHREEGDAWgRRjYUB1bmktb3NuYWJydWVjay5kZTCBiAYDVR0fBIGAMH4w PaA7oDmGN2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXJvb3QtY2EvcHViL2NybC9j YWNybC5jcmwwPaA7oDmGN2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXJvb3QtY2Ev cHViL2NybC9jYWNybC5jcmwwgdcGCCsGAQUFBwEBBIHKMIHHMDMGCCsGAQUFBzABhidodHRw Oi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRwYIKwYBBQUHMAKGO2h0dHA6 Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXJvb3QtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0 MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1yb290LWNhL3B1 Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEApVPS1rUMH9oWu02nJHDV C7jF74wUYbzFaX1ULtkEGXK0MV2HyR8kZ3t19qcmEzgo/eaYv5+OE/nMnNHWUH/ybTN3bQFF K4+L+42SwRkSnyXVQsb38NsUknpDAlUeR9+jv5rkhIF5u+sRIXSB1lzoohtVUkYsC50UO1L4 bWchK7DE++22NDiTgtoFWwC1nn2wt8FYTB4IIbCOogEI6fFXIHZkG6BlLiYmPFmbNfPwNJpv 25g87P0SXpQR1uxSv4giL6o6XWCDJpnCEA4+029ZYLZG0e1bSzk4wI+ho08oxNs8B7NPlH2p jOpq40pZwvVw5rp2nu3W5CaDxgHdxXBX5DCCBYcwggRvoAMCAQICBxWm3SXtmbEwDQYJKoZI hvcNAQEFBQAwgZExCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdVbml2ZXJzaXRhZXQgT3NuYWJy dWVjazEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTEjMCEGA1UEAxMaVW5pLU9zbmFicnVlY2sg UlotQ0EgRy0wMDIxIzAhBgkqhkiG9w0BCQEWFGNhQHVuaS1vc25hYnJ1ZWNrLmRlMB4XDTEz MDUwNjA3NDUyNVoXDTE2MDUwNTA3NDUyNVowXjELMAkGA1UEBhMCREUxIDAeBgNVBAoTF1Vu aXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRUwEwYDVQQD EwxEaXJrIEthc3RlbnMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZObhf0kwV d2daq89+nHsASWUXo8iLb+T9y2N5cmwkVMwAjgtTqjJu+P8jQOxxKaK35pWS5CB1HGiNqLms NOdMVqf1PXdnDANE//wGsMTKwKVjhYlj7PoPSuwAZ4NT8eTf/UR3ViPA64r9qCB8pYBO3L1w n6oMiXdWD8Vd7OVEVzGeMoVYstRyv+wzUAPJotGCd5smxEq+LMTv1HQ6xtZW2le5bMub4uk4 UdACPgCDBGP07sQvM8krM5fNOIbzNRyqD7eERnSMGkounpRkHSwoWUkt1njYUrxk1q4qMDBz xEIx4MPGPw57HN0VQ9z/3eUBjmZi+oqlxkDlHwzcvsH3AgMBAAGjggIUMIICEDAvBgNVHSAE KDAmMBEGDysGAQQBga0hgiwBAQQDADARBg8rBgEEAYGtIYIsAgEEAwAwCQYDVR0TBAIwADAL BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMB0GA1UdDgQWBBQ4 FSGPMJNnhKKMKGStCzA58jMkmjAfBgNVHSMEGDAWgBSqH9h3FW6Z5F+Q1uxjJk4Z6mcUUDAp BgNVHREEIjAggR5kaXJrLmthc3RlbnNAdW5pLW9zbmFicnVlY2suZGUwgY8GA1UdHwSBhzCB hDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktb3NuYWJydWVjay1jYS9wdWIv Y3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktb3NuYWJy dWVjay1jYS9wdWIvY3JsL2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUH MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW9zbmFicnVlY2stY2EvcHViL2NhY2Vy dC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1v c25hYnJ1ZWNrLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA pJjFnuZVVSPNqukqAI+ZWWClujzCsBdN1Zq95kik17FqjsB8TSqelmmohw1qBQXq3EnDFmWy R6FuNqYOPjborAEkhwRPmUXDDLvCU02TvwtxFuNJZc0ALz41oR8s8l5PBYoNlpPsYz+tsbKX +15XnsH1ftR/wzqaWPMLfWhG0OnLObeEMb+y5EQPO5kKzf+EdM/JmITWnip03FAtcr9JWq3N p6APfIDoWJ4uM5CyOvnEox41V+2a6PuOKY/bPE9seCOBbduWb15pXYZB7EHWM5Hkp5bLsl7s YtnFH++SCDLyutyLq4LCw1ryt7rLzkUEQ/YZOAqkfifDY6OdW3cRqzGCA/gwggP0AgEBMIGd MIGRMQswCQYDVQQGEwJERTEgMB4GA1UEChMXVW5pdmVyc2l0YWV0IE9zbmFicnVlY2sxFjAU BgNVBAsTDVJlY2hlbnplbnRydW0xIzAhBgNVBAMTGlVuaS1Pc25hYnJ1ZWNrIFJaLUNBIEct MDAyMSMwIQYJKoZIhvcNAQkBFhRjYUB1bmktb3NuYWJydWVjay5kZQIHFabdJe2ZsTAJBgUr DgMCGgUAoIICLzAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0x NTAxMTIxNTMyNDVaMCMGCSqGSIb3DQEJBDEWBBS6OOuWq562k3pz6MZsbg4R/6KqLjBsBgkq hkiG9w0BCQ8xXzBdMAsGCWCGSAFlAwQBKjALBglghkgBZQMEAQIwCgYIKoZIhvcNAwcwDgYI KoZIhvcNAwICAgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMIGu BgkrBgEEAYI3EAQxgaAwgZ0wgZExCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdVbml2ZXJzaXRh ZXQgT3NuYWJydWVjazEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTEjMCEGA1UEAxMaVW5pLU9z bmFicnVlY2sgUlotQ0EgRy0wMDIxIzAhBgkqhkiG9w0BCQEWFGNhQHVuaS1vc25hYnJ1ZWNr LmRlAgcVpt0l7ZmxMIGwBgsqhkiG9w0BCRACCzGBoKCBnTCBkTELMAkGA1UEBhMCREUxIDAe BgNVBAoTF1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVt MSMwIQYDVQQDExpVbmktT3NuYWJydWVjayBSWi1DQSBHLTAwMjEjMCEGCSqGSIb3DQEJARYU Y2FAdW5pLW9zbmFicnVlY2suZGUCBxWm3SXtmbEwDQYJKoZIhvcNAQEBBQAEggEABJqxTgyv 1x/zocqOjXizXSpa0Lpa++ONFhItrhQUGdAIYaw600kwwl686ds4CLDRBOqlmqrQg4YOb8QR eSqVyK4OR6VZ65MBJ5mHVDKepgUBoZM7gh9LX4DUW4xVdvvsjBvUhhtq/JXC/2VfBBoNhSMH 8fJgisL5+k7YRgG3sgCJm0mQq2er9qRWHSlNssbUUb5SGbfvOTFvcVxDCBbEL1JYgT0dPd4U V/1WppJBkex2+7Wf2EA3kBDdFTmq5yg4C1mYgLb0647A1wVYzxufidcRCFiYjcroEVXu3pdC N+JJII0RN0nVqsZiOzU3K271xH136pFF5UkUKsvdCtNapAAAAAAAAA== --------------ms020609010007010102020405--

1 0

Re: (ITS#8022) Backend Meta does not work with ssl-backends
by hyc＠symas.com 12 Jan '15

12 Jan '15

dirk.kastens(a)uni-osnabrueck.de wrote: > Full_Name: Dirk Kastens > Version: 2.4.40 > OS: RedHat SL 7.0 > URL: ftp://ftp.openldap.org/incoming/ > Submission from: (NULL) (2001:638:508:3d0:579:e63b:2c0e:3a09) > > > This is a duplicate of #7983 Then you should have simply followed up to #7983. Does ldapsearch work against the target servers using the certificate configurations you listed? Without a reproducible test case you'll get the same response as #7983 - no evidence of an OpenLDAP software bug, take this to the -technical list for help fixing your configuration. Or take this to RedHat support for help using their build of TLS software. > I'm running an openldap server with a meta backend that combines the > trees of three different ldap servers. Two of them are connected via > starttls and one via ssl over port 636. This perfectly works with > openldap-2.4.23. > Now I have upgraded the server to RedHat SL 7.0 with openldap-2.4.39. > The ssl server cannot be reached by the meta backend any more. I > manually compiled openldap 2.4.40, but the effect is the same. I tried > openssl and moznss, but this makes no difference. I only see the trees > of the tls connected servers. > The tls servers also speak ssl, so I simply changed the uri from "ldap:" > to "ldaps:". The effect is, that the servers also became unreachable. > > Here is my configuration: > ------------------------------- > database meta > suffix "ou=new,dc=xyz,dc=de" > > uri "ldap://ldap.xyz.de/ou=a,ou=new,dc=xyz,dc=de" > suffixmassage "ou=a,ou=new,dc=xyz,dc=de" "ou=people,dc=xyz,dc=de" > idassert-bind bindmethod=simple binddn="cn=proxy,dc=xyz,dc=de" > credentials="secret" mode=self > tls_cert=/etc/openldap/certs/client.pem > tls_key=/etc/openldap/certs/client.key > tls_cacert=/etc/openldap/cacerts/cacerts.pem > tls_cacertdir=/etc/openldap/cacerts > tls_rcecert=never > idassert-authzFrom "dn.exact:cn=root,ou=new,dc=xyz,dc=de" > > uri "ldaps://ldap.abc.de:636/ou=b,ou=new,dc=xyz,dc=de" > suffixmassage "ou=b,ou=new,dc=xyz,dc=de" "ou=people,dc=abc,dc=de" > idassert-bind bindmethod=simple binddn="cn=proxy,dc=abc,dc=de" > credentials="secret" mode=self starttls=no > tls_cert=/etc/openldap/certs/client.pem > tls_key=/etc/openldap/certs/client.key > tls_cacert=/etc/openldap/cacerts/cacerts.pem > tls_cacertdir=/etc/openldap/cacerts > tls_reqcert=never > idassert-authzFrom "dn.exact:cn=root,ou=new,dc=xyz,dc=de" > ------------------------------- > > When I search the meta directory, I only see the ou=a branch. > slapd logs the following: > > conn=1000 op=1 SRCH base="ou=new,dc=xyz,dc=de" scop3D3D1 deref=3 > filter="(objectClass=*)" > conn=1000 op=1 SRCH attr=objectclass > conn=1000 op=1: meta_back_getconn[0] > conn=1000 op=1: meta_back_getconn[1] > conn=1000 op=1 meta_back_getconn: candidates=2 conn=ROOTDN-TLS inserted > conn=1000 op=1 >E%E> meta_back_search_start[0] > conn=1000 op=1 >>> meta_search_dobind_init[0] > conn=1000 op=1 <<< meta_search_dobind_init[0]=2 > conn=1000 op=1 <<< meta_back_search_start[0]=2 > conn=1000 op=1 >>> meta_back_search_start[1] > conn=1000 op=1 >>> meta_search_dobind_init[1] > conn=1000 op=1 <<< meta_search_dobind_init[1]=4 > conn=1000 op=1 <<< meta_back_search_start[1]=4 > conn=1000 op=1 meta_back_search: ncandidates=2 cnd="**" > conn=1000 op=1 >>> meta_back_search_start[0] > conn=1000 op=1 >>> meta_search_dobind_init[5D5D > conn=1000 op=1 <<< meta_search_dobind_init[0]=1 > ... > conn=1000 op=1 <<< meta_back_search_start[0]=1 > conn=1000 op=1 >>> meta_search_dobind_init[1] > conn=1000 op=1 <<< meta_search_dobind_init[1]=0 > ------------------------------- > > It seems to find both servers, but it only connects to the first one. > With ldapsearch I only see the branch "ou=a,ou=new,dc=xyz,dc=de". > slapd hangs and can only be terminated by "kill -4". When the first server is > specified with ldaps, none of the servers are reachable. > > > -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

(ITS#8022) Backend Meta does not work with ssl-backends
by dirk.kastens＠uni-osnabrueck.de 12 Jan '15

12 Jan '15

Full_Name: Dirk Kastens Version: 2.4.40 OS: RedHat SL 7.0 URL: ftp://ftp.openldap.org/incoming/ Submission from: (NULL) (2001:638:508:3d0:579:e63b:2c0e:3a09) This is a duplicate of #7983 I'm running an openldap server with a meta backend that combines the trees of three different ldap servers. Two of them are connected via starttls and one via ssl over port 636. This perfectly works with openldap-2.4.23. Now I have upgraded the server to RedHat SL 7.0 with openldap-2.4.39. The ssl server cannot be reached by the meta backend any more. I manually compiled openldap 2.4.40, but the effect is the same. I tried openssl and moznss, but this makes no difference. I only see the trees of the tls connected servers. The tls servers also speak ssl, so I simply changed the uri from "ldap:" to "ldaps:". The effect is, that the servers also became unreachable. Here is my configuration: ------------------------------- database meta suffix "ou=new,dc=xyz,dc=de" uri "ldap://ldap.xyz.de/ou=a,ou=new,dc=xyz,dc=de" suffixmassage "ou=a,ou=new,dc=xyz,dc=de" "ou=people,dc=xyz,dc=de" idassert-bind bindmethod=simple binddn="cn=proxy,dc=xyz,dc=de" credentials="secret" mode=self tls_cert=/etc/openldap/certs/client.pem tls_key=/etc/openldap/certs/client.key tls_cacert=/etc/openldap/cacerts/cacerts.pem tls_cacertdir=/etc/openldap/cacerts tls_rcecert=never idassert-authzFrom "dn.exact:cn=root,ou=new,dc=xyz,dc=de" uri "ldaps://ldap.abc.de:636/ou=b,ou=new,dc=xyz,dc=de" suffixmassage "ou=b,ou=new,dc=xyz,dc=de" "ou=people,dc=abc,dc=de" idassert-bind bindmethod=simple binddn="cn=proxy,dc=abc,dc=de" credentials="secret" mode=self starttls=no tls_cert=/etc/openldap/certs/client.pem tls_key=/etc/openldap/certs/client.key tls_cacert=/etc/openldap/cacerts/cacerts.pem tls_cacertdir=/etc/openldap/cacerts tls_reqcert=never idassert-authzFrom "dn.exact:cn=root,ou=new,dc=xyz,dc=de" ------------------------------- When I search the meta directory, I only see the ou=a branch. slapd logs the following: conn=1000 op=1 SRCH base="ou=new,dc=xyz,dc=de" scop3D3D1 deref=3 filter="(objectClass=*)" conn=1000 op=1 SRCH attr=objectclass conn=1000 op=1: meta_back_getconn[0] conn=1000 op=1: meta_back_getconn[1] conn=1000 op=1 meta_back_getconn: candidates=2 conn=ROOTDN-TLS inserted conn=1000 op=1 >E%E> meta_back_search_start[0] conn=1000 op=1 >>> meta_search_dobind_init[0] conn=1000 op=1 <<< meta_search_dobind_init[0]=2 conn=1000 op=1 <<< meta_back_search_start[0]=2 conn=1000 op=1 >>> meta_back_search_start[1] conn=1000 op=1 >>> meta_search_dobind_init[1] conn=1000 op=1 <<< meta_search_dobind_init[1]=4 conn=1000 op=1 <<< meta_back_search_start[1]=4 conn=1000 op=1 meta_back_search: ncandidates=2 cnd="**" conn=1000 op=1 >>> meta_back_search_start[0] conn=1000 op=1 >>> meta_search_dobind_init[5D5D conn=1000 op=1 <<< meta_search_dobind_init[0]=1 ... conn=1000 op=1 <<< meta_back_search_start[0]=1 conn=1000 op=1 >>> meta_search_dobind_init[1] conn=1000 op=1 <<< meta_search_dobind_init[1]=0 ------------------------------- It seems to find both servers, but it only connects to the first one. With ldapsearch I only see the branch "ou=a,ou=new,dc=xyz,dc=de". slapd hangs and can only be terminated by "kill -4". When the first server is specified with ldaps, none of the servers are reachable.

1 0

Re: (ITS#8018) a lot of warnings building with -Wall
by h.b.furuseth＠usit.uio.no 12 Jan '15

12 Jan '15

On 01/06/2015 04:31 PM, hyc(a)symas.com wrote: > Leonid Yuriev wrote: >> Yes of course, all warnings could be hushed by compiler options, but >> this also hides the real mistakes. >> So, I prefer fix the warnings, instead of disable gcc/clang features. >> >> Please review attached patchset and merge. > > Your patch assumes CPP features that are not guaranteed to be present. > Rejecting this patchset. The Debug() change is going to give merge conflicts all over the place when your <https://github.com/ReOpen/ReOpenLDAP> and OpenLDAP pull updates from each other. How about defining Debug1(), Debug2(), etc for 1,2... arguments? That's still annoying, but it keeps the code C90-compatible and keeps -Wformat quiet. There's already similar code for Log<N>() in include/ldap_log.h, but it was never used much or even merged into RE24. (Because it got scheduled for RE25 which was going to start Real Soon Now, IIRC:-) -- Hallvard

1 0

Re: (ITS#8021) Wrong mdb_env_sync() with at least MDB_RDONLY
by h.b.furuseth＠usit.uio.no 08 Jan '15

08 Jan '15

On 08/01/15 20:52, h.b.furuseth(a)usit.uio.no wrote: > Users are likely doing the same thing anyway: Using MDB_RDONLY > instead of MDB_RDONLY|MDB_WRITEMAP on WRITEMAP-written DBs. Er, I mean if any users are doing this. But users do come up with things that the developers never thought of.

1 0

Re: (ITS#8021) Wrong mdb_env_sync() with at least MDB_RDONLY
by h.b.furuseth＠usit.uio.no 08 Jan '15

08 Jan '15

On 08/01/15 20:59, Howard Chu wrote: > mdb_env_sync() shouldn't even be doing any work at all if the env was > opened RDONLY. We should return nop in that case. RDONLY means RDONLY! Currently it syncs changes written by another process.

1 0

Re: (ITS#8021) Wrong mdb_env_sync() with at least MDB_RDONLY
by hyc＠symas.com 08 Jan '15

08 Jan '15

h.b.furuseth(a)usit.uio.no wrote: > Full_Name: Hallvard B Furuseth > Version: lmdb 0.9.14 > OS: > URL: > Submission from: (NULL) (81.191.45.22) > Submitted by: hallvard > > > mdb_env_sync() works with MDB_RDONLY at least on Unix, but > it syncs MDB_WRITEMAP changes incorrectly: fdatasync instead > of msync because mdb_env_open() cleared MDB_WRITEMAP. > > Users are likely doing the same thing anyway: Using MDB_RDONLY > instead of MDB_RDONLY|MDB_WRITEMAP on WRITEMAP-written DBs. mdb_env_sync() shouldn't even be doing any work at all if the env was opened RDONLY. We should return nop in that case. RDONLY means RDONLY! No writes, no calls that will alter the storage layer. -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

(ITS#8021) Wrong mdb_env_sync() with at least MDB_RDONLY
by h.b.furuseth＠usit.uio.no 08 Jan '15

08 Jan '15

Full_Name: Hallvard B Furuseth Version: lmdb 0.9.14 OS: URL: Submission from: (NULL) (81.191.45.22) Submitted by: hallvard mdb_env_sync() works with MDB_RDONLY at least on Unix, but it syncs MDB_WRITEMAP changes incorrectly: fdatasync instead of msync because mdb_env_open() cleared MDB_WRITEMAP. Users are likely doing the same thing anyway: Using MDB_RDONLY instead of MDB_RDONLY|MDB_WRITEMAP on WRITEMAP-written DBs. Finally, writers committing with and without WRITEMAP will sync each others' commits incorrectly. lmdb.h does warn they will "not cooperate well", but it should warn it breaks ACID. LMDBv2 can instead fix all this with 2 bits in MDB_meta: "Changed with/without WRITEMAP since last sync". In LMDBv1, I think the smallest-impact fix is for env_sync to both msync and fdatasync when RDONLY is set and WRITEMAP is clear. A greedier fix would be to always sync both ways when the user calls env_sync. Either way, it may be best to keep WRITEMAP when RDONLY. Only env_map() needs to deal with that. Pushing suggestions except doc to "mdb/wmap-fix" in my repo.

1 0

(ITS#8020) 64bit indexer broken
by hyc＠openldap.org 07 Jan '15

07 Jan '15

Full_Name: Howard Chu Version: 2.4 OS: URL: ftp://ftp.openldap.org/incoming/ Submission from: (NULL) (78.155.233.73) Submitted by: hyc Only 32 bits of the hash were being used. patch coming shortly

1 0

Re: (ITS#8019) LDAP Replication By attribute
by quanah＠zimbra.com 07 Jan '15

07 Jan '15

--On Wednesday, January 07, 2015 4:19 PM +0000 sofiene.blouza(a)etiam.com wrote: > Full_Name: SOFIENE BLOUZA > Version: 2.4.23-34.el6_5.1 > OS: Centos 6.6 > URL: ftp://ftp.openldap.org/incoming/ > Submission from: (NULL) (217.109.110.145) The ITS system is for reporting bugs, not for usage questions. Usage questions belong on the openldap-technical(a)openldap.org list. I would note that the version you reference is extremely old, and it would be advised as your first step to upgrade to a current OpenLDAP release. --Quanah -- Quanah Gibson-Mount Platform Architect Zimbra, Inc. -------------------- Zimbra :: the leader in open source messaging and collaboration

1 0

(ITS#8019) LDAP Replication By attribute
by sofiene.blouza＠etiam.com 07 Jan '15

07 Jan '15

Full_Name: SOFIENE BLOUZA Version: 2.4.23-34.el6_5.1 OS: Centos 6.6 URL: ftp://ftp.openldap.org/incoming/ Submission from: (NULL) (217.109.110.145) Hello, I want to make replication betweend two ldap servers using Delta-syncrepl. I use the tuto http://www.openldap.org/doc/admin24/replication.html#Delta-syncrepl on section 18.3.2. I make the configuration but it doesnt work correctly. How can I fix the problem! Thunks a lot

1 0

Re: (ITS#8018) a lot of warnings building with -Wall
by hyc＠symas.com 06 Jan '15

06 Jan '15

Leonid Yuriev wrote: > Yes of course, all warnings could be hushed by compiler options, but > this also hides the real mistakes. > So, I prefer fix the warnings, instead of disable gcc/clang features. > > Please review attached patchset and merge. Your patch assumes CPP features that are not guaranteed to be present. Rejecting this patchset. Learn more about how OpenLDAP software is built and why. > > Leonid. > > --- > > The attached files is derived from OpenLDAP Software. All of the > modifications > to OpenLDAP Software represented in the following patch(es) were > developed by > Peter-Service LLC, Moscow, Russia. Peter-Service LLC has not assigned > rights > and/or interest in this work to any party. I, Leonid Yuriev am > authorized by > Peter-Service LLC, my employer, to release this work under the following > terms. > > Peter-Service LLC hereby places the following modifications to OpenLDAP > Software > (and only these modifications) into the public domain. Hence, these > modifications may be freely used and/or redistributed for any purpose > with or without attribution and/or other notice > > -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#8018) a lot of warnings building with -Wall
by leo＠yuriev.ru 06 Jan '15

06 Jan '15

--e89a8f8389d152e760050bfd4ba8 Content-Type: text/plain; charset=UTF-8 Fast-forward 'pull' is also available https://github.com/leo-yuriev/openldap-lmdb-challenge.git Leonid. 2015-01-06 18:10 GMT+03:00 Leonid Yuriev <leo(a)yuriev.ru>: > Yes of course, all warnings could be hushed by compiler options, but this > also hides the real mistakes. > So, I prefer fix the warnings, instead of disable gcc/clang features. > > Please review attached patchset and merge. > > Leonid. > > --- > > The attached files is derived from OpenLDAP Software. All of the > modifications > to OpenLDAP Software represented in the following patch(es) were developed > by > Peter-Service LLC, Moscow, Russia. Peter-Service LLC has not assigned > rights > and/or interest in this work to any party. I, Leonid Yuriev am authorized > by > Peter-Service LLC, my employer, to release this work under the following > terms. > > Peter-Service LLC hereby places the following modifications to OpenLDAP > Software > (and only these modifications) into the public domain. Hence, these > modifications may be freely used and/or redistributed for any purpose > with or without attribution and/or other notice > > > --e89a8f8389d152e760050bfd4ba8 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div><div>Fast-forward 'pull' is also available</d= iv><div><a href=3D"https://github.com/leo-yuriev/openldap-lmdb-challenge.gi= t">https://github.com/leo-yuriev/openldap-lmdb-challenge.git</a><br><br>Leo= nid.</div></div></div><div class=3D"gmail_extra"><br><div class=3D"gmail_qu= ote">2015-01-06 18:10 GMT+03:00 Leonid Yuriev <span dir=3D"ltr"><<a href= =3D"mailto:leo@yuriev.ru" target=3D"_blank">leo(a)yuriev.ru</a>></span>:<b= r><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:= 1px #ccc solid;padding-left:1ex">Yes of course, all warnings could be hushe= d by compiler options, but this also hides the real mistakes.<br> So, I prefer fix the warnings, instead of disable gcc/clang features.<br> <br> Please review attached patchset and merge.<br> <br> Leonid.<br> <br> ---<br> <br> The attached files is derived from OpenLDAP Software. All of the modificati= ons<br> to OpenLDAP Software represented in the following patch(es) were developed = by<br> Peter-Service LLC, Moscow, Russia. Peter-Service LLC has not assigned right= s<br> and/or interest in this work to any party. I, Leonid Yuriev am authorized b= y<br> Peter-Service LLC, my employer, to release this work under the following te= rms.<br> <br> Peter-Service LLC hereby places the following modifications to OpenLDAP Sof= tware<br> (and only these modifications) into the public domain. Hence, these<br> modifications may be freely used and/or redistributed for any purpose<br> with or without attribution and/or other notice<br> <br> <br> </blockquote></div><br></div> --e89a8f8389d152e760050bfd4ba8--

1 0

Re: (ITS#8018) a lot of warnings building with -Wall
by hyc＠symas.com 06 Jan '15

06 Jan '15

leo(a)yuriev.ru wrote: > Full_Name: Leonid Yuriev > Version: git-master > OS: RHEL7 > URL: ftp://ftp.openldap.org/incoming/ > Submission from: (NULL) (31.130.36.33) > > > It is about 5K warnings reported by gcc/clang if building OpenLDAP with -Wall. > > CFLAGS="-Wall" ./configure ... No need for that. Learn how to use make. > make depend && make make AC_CFLAGS="-Wall -Wno-format-extra-args" -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#8018) a lot of warnings building with -Wall
by hyc＠symas.com 06 Jan '15

06 Jan '15

leo(a)yuriev.ru wrote: > Full_Name: Leonid Yuriev > Version: git-master > OS: RHEL7 > URL: ftp://ftp.openldap.org/incoming/ > Submission from: (NULL) (31.130.36.33) > > > It is about 5K warnings reported by gcc/clang if building OpenLDAP with -Wall. > > CFLAGS="-Wall" ./configure ... > make depend && make > > The vast majority of warnings about harmless things: unnecessary arguments to > printf through Debug macro, Ignore those. Use -Wno-format-extra-args > unused variables and functions, etc. > But such amount of warnings makes impossible to use -Wall to find a potential > problems. > > I have prepared the patchset which fixes most of these warnings. > It will be submited shortly. > > Leonid. > > -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#8018) a lot of warnings building with -Wall
by pierangelo.masarati＠polimi.it 06 Jan '15

06 Jan '15

On 06/01/2015 15:47, leo(a)yuriev.ru wrote: > Full_Name: Leonid Yuriev > Version: git-master > OS: RHEL7 > URL: ftp://ftp.openldap.org/incoming/ > Submission from: (NULL) (31.130.36.33) > > > It is about 5K warnings reported by gcc/clang if building OpenLDAP with -Wall. > > CFLAGS="-Wall" ./configure ... > make depend && make > > The vast majority of warnings about harmless things: unnecessary arguments to > printf through Debug macro, unused variables and functions, etc. > But such amount of warnings makes impossible to use -Wall to find a potential > problems. > > I have prepared the patchset which fixes most of these warnings. > It will be submited shortly. My 2c: - normal users do not need to build with -Wall; only developers might need to - in addition to -Wall, if you add -Wno-[specific harmless warnings you want to disable], then only relevant ones do surface. p. -- Pierangelo Masarati Associate Professor Dipartimento di Scienze e Tecnologie Aerospaziali Politecnico di Milano

1 0

(ITS#8018) a lot of warnings building with -Wall
by leo＠yuriev.ru 06 Jan '15

06 Jan '15

Full_Name: Leonid Yuriev Version: git-master OS: RHEL7 URL: ftp://ftp.openldap.org/incoming/ Submission from: (NULL) (31.130.36.33) It is about 5K warnings reported by gcc/clang if building OpenLDAP with -Wall. CFLAGS="-Wall" ./configure ... make depend && make The vast majority of warnings about harmless things: unnecessary arguments to printf through Debug macro, unused variables and functions, etc. But such amount of warnings makes impossible to use -Wall to find a potential problems. I have prepared the patchset which fixes most of these warnings. It will be submited shortly. Leonid.

1 0

Re: (ITS#8017) Enhancement: Limit core dump size
by quanah＠zimbra.com 05 Jan '15

05 Jan '15

--On Tuesday, January 06, 2015 1:31 AM +0000 gnoe(a)symas.com wrote: > Full_Name: Greg Noe > Version: NA > OS: NA > URL: ftp://ftp.openldap.org/incoming/ > Submission from: (NULL) (63.142.209.94) > > > Request: If possible, add an option to limit the size of a core dump > when slapd crashes. > > Reason for request: In cases where very large caches are used and slapd > crashes, the size of the core dump files can exceed the available disk > space. Core dump size is controlled by the kernel already, via sysctl. Why does one need an option to slapd for this? -- Quanah Gibson-Mount Platform Architect Zimbra, Inc. -------------------- Zimbra :: the leader in open source messaging and collaboration

1 0

(ITS#8017) Enhancement: Limit core dump size
by gnoe＠symas.com 05 Jan '15

05 Jan '15

Full_Name: Greg Noe Version: NA OS: NA URL: ftp://ftp.openldap.org/incoming/ Submission from: (NULL) (63.142.209.94) Request: If possible, add an option to limit the size of a core dump when slapd crashes. Reason for request: In cases where very large caches are used and slapd crashes, the size of the core dump files can exceed the available disk space.

1 0

Re: (ITS#8016) silence on wrong envflags for lmdb-backend
by hyc＠symas.com 05 Jan '15

05 Jan '15

leo(a)yuriev.ru wrote: > Full_Name: Leonid Yuriev > Version: 2.4-HEAD > OS: RHEL7 > URL: ftp://ftp.openldap.org/incoming/ > Submission from: (NULL) (31.130.36.33) > > > No any error reported by lmdb-backend when wrong options was specified in > envflags. > > For example slapd.conf: > envflags This is a rebus codestyle and the technical debt > > Patch will be available shortly. fixed in master -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#8016) silence on wrong envflags for lmdb-backend
by hyc＠symas.com 05 Jan '15

05 Jan '15

leo(a)yuriev.ru wrote: > This is a multi-part message in MIME format. > --------------080401010006020303000400 > Content-Type: text/plain; charset=windows-1251; format=flowed > Content-Transfer-Encoding: 7bit > > Please review and merge. > > Leonid. > > --- > > The attached files is derived from OpenLDAP Software. All of the > modifications > to OpenLDAP Software represented in the following patch(es) were > developed by > Peter-Service LLC, Moscow, Russia. Peter-Service LLC has not assigned > rights > and/or interest in this work to any party. I, Leonid Yuriev am > authorized by > Peter-Service LLC, my employer, to release this work under the following > terms. > > Peter-Service LLC hereby places the following modifications to OpenLDAP > Software > (and only these modifications) into the public domain. Hence, these > modifications may be freely used and/or redistributed for any purpose > with or without attribution and/or other notice. > > > > --------------080401010006020303000400 > Content-Type: text/x-patch; > name="its8016.patch" > Content-Transfer-Encoding: 7bit > Content-Disposition: attachment; > filename="its8016.patch" > > commit 36ecfd44559d3b89a7dd5bcbfb6a22d8aeb8142b > Author: Leo Yuriev <leo(a)yuriev.ru> > Date: 2015-01-04 09:05:36 +0300 > > fix: report about wrong envflags in lmdb-backend instead of silently ignore them. > > diff --git a/servers/slapd/back-mdb/config.c b/servers/slapd/back-mdb/config.c > index bb9be73..68009b6 100644 > --- a/servers/slapd/back-mdb/config.c > +++ b/servers/slapd/back-mdb/config.c > @@ -620,8 +620,10 @@ mdb_cf_gen( ConfigArgs *c ) > } > mdb->mi_dbenv_flags |= mdb_envflags[j].mask; > } else { > - /* unknown keyword */ > - rc = 1; > + fprintf( stderr, "%s: " > + "unknown keyword \"%s\" in \"envflags\".\n", > + c->log, c->argv[i] ); > + return 1; > } > } > } > > --------------080401010006020303000400-- Use of fprintf(stderr) for config errors is deprecated. New code should only be using c->cr_msg. -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#8016) silence on wrong envflags for lmdb-backend
by leo＠yuriev.ru 04 Jan '15

04 Jan '15

This is a multi-part message in MIME format. --------------080401010006020303000400 Content-Type: text/plain; charset=windows-1251; format=flowed Content-Transfer-Encoding: 7bit Please review and merge. Leonid. --- The attached files is derived from OpenLDAP Software. All of the modifications to OpenLDAP Software represented in the following patch(es) were developed by Peter-Service LLC, Moscow, Russia. Peter-Service LLC has not assigned rights and/or interest in this work to any party. I, Leonid Yuriev am authorized by Peter-Service LLC, my employer, to release this work under the following terms. Peter-Service LLC hereby places the following modifications to OpenLDAP Software (and only these modifications) into the public domain. Hence, these modifications may be freely used and/or redistributed for any purpose with or without attribution and/or other notice. --------------080401010006020303000400 Content-Type: text/x-patch; name="its8016.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="its8016.patch" commit 36ecfd44559d3b89a7dd5bcbfb6a22d8aeb8142b Author: Leo Yuriev <leo(a)yuriev.ru> Date: 2015-01-04 09:05:36 +0300 fix: report about wrong envflags in lmdb-backend instead of silently ignore them. diff --git a/servers/slapd/back-mdb/config.c b/servers/slapd/back-mdb/config.c index bb9be73..68009b6 100644 --- a/servers/slapd/back-mdb/config.c +++ b/servers/slapd/back-mdb/config.c @@ -620,8 +620,10 @@ mdb_cf_gen( ConfigArgs *c ) } mdb->mi_dbenv_flags |= mdb_envflags[j].mask; } else { - /* unknown keyword */ - rc = 1; + fprintf( stderr, "%s: " + "unknown keyword \"%s\" in \"envflags\".\n", + c->log, c->argv[i] ); + return 1; } } } --------------080401010006020303000400--

1 0

(ITS#8016) silence on wrong envflags for lmdb-backend
by leo＠yuriev.ru 04 Jan '15

04 Jan '15

Full_Name: Leonid Yuriev Version: 2.4-HEAD OS: RHEL7 URL: ftp://ftp.openldap.org/incoming/ Submission from: (NULL) (31.130.36.33) No any error reported by lmdb-backend when wrong options was specified in envflags. For example slapd.conf: envflags This is a rebus codestyle and the technical debt Patch will be available shortly.

1 0

Re: (ITS#8011) few mistakes in lmdb-backend
by hyc＠symas.com 03 Jan '15

03 Jan '15

Леонид Юрьев wrote: > Updated. > Please pickup. > diff --git a/servers/slapd/back-mdb/dn2id.c b/servers/slapd/back-mdb/dn2id.c > index 41c4758..0890bce 100644 > --- a/servers/slapd/back-mdb/dn2id.c > +++ b/servers/slapd/back-mdb/dn2id.c > @@ -746,7 +746,8 @@ mdb_idscopes( > /* remember our chain of parents */ > id2.mid = id; > id2.mval = data; > - mdb_id2l_insert( isc->sctmp, &id2 ); > + rc = mdb_id2l_insert( isc->sctmp, &id2 ); > + assert(rc == 0); > } > ptr = data.mv_data; > ptr += data.mv_size - sizeof(ID); Unnecessary, the total number of parents is constrained by the max length of a DN which is 8192 bytes. A maximum depth DN (max number of shortest possible RDNs) will always fit in sctmp. I will commit the remainder of the patch. -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#8012) SIGSEGV while disconnect/abandon
by hyc＠symas.com 03 Jan '15

03 Jan '15

Leonid Yuriev wrote: > Patch update: > > Detaching a syncops record from op-list CONDITIONALLY, only when it > was freed by syncprov_free_syncop. > The syncprov_drop_psearch() and syncprov_drop_psearch() now returns > a flag, which is nonzero if the given syncops was freed. Thanks, applied to master. > > Leonid. > > 29.12.2014 13:50, Leonid Yuriev ïèøåò: >> Please review attached patch and merge-in. >> >> Leonid. >> >> --- >> >> The attached files is derived from OpenLDAP Software. All of the >> modifications >> to OpenLDAP Software represented in the following patch(es) were >> developed by >> Peter-Service LLC, Moscow, Russia. Peter-Service LLC has not assigned >> rights >> and/or interest in this work to any party. I, Leonid Yuriev am >> authorized by >> Peter-Service LLC, my employer, to release this work under the >> following terms. >> >> Peter-Service LLC hereby places the following modifications to >> OpenLDAP Software >> (and only these modifications) into the public domain. Hence, these >> modifications may be freely used and/or redistributed for any purpose >> with or without attribution and/or other notice. >> > -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#8013) SIGSEGV in test_filter()
by hyc＠symas.com 03 Jan '15

03 Jan '15

hyc(a)symas.com wrote: > Leonid Yuriev wrote: >> >> 04.01.2015 02:47, Howard Chu wrote: >>> The patch is wrong. syncprov_matchops can be called twice for the same >>> operation; toggling the flag where you've placed it means the filter >>> will be incorrect on the 2nd invocation as well as on all subsequent >>> invocations. >> >> Ok, but found another case. >> The ss->s_op->ors_filter may be updated immediately after the s_mutex >> released. > > Seems like the simpler fix then is to keep the mutex held until after > test_filter finishes. Fixed in master. -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#8013) SIGSEGV in test_filter()
by hyc＠symas.com 03 Jan '15

03 Jan '15

Leonid Yuriev wrote: > > 04.01.2015 02:47, Howard Chu wrote: >> The patch is wrong. syncprov_matchops can be called twice for the same >> operation; toggling the flag where you've placed it means the filter >> will be incorrect on the 2nd invocation as well as on all subsequent >> invocations. > > Ok, but found another case. > The ss->s_op->ors_filter may be updated immediately after the s_mutex > released. Seems like the simpler fix then is to keep the mutex held until after test_filter finishes. > > This is a simple change for reproducing the bug. > > diff --git a/servers/slapd/overlays/syncprov.c > b/servers/slapd/overlays/syncprov.c > index 5ef2eaa..f579faa 100644 > --- a/servers/slapd/overlays/syncprov.c > +++ b/servers/slapd/overlays/syncprov.c > @@ -1295,6 +1295,7 @@ syncprov_matchops( Operation *op, opcookie *opc, > int saveit ) > } > > if ( fc.fscope ) { > + Filter *paranoia; > ldap_pvt_thread_mutex_lock( &ss->s_mutex ); > op2 = *ss->s_op; > oh = *op->o_hdr; > @@ -1304,6 +1305,7 @@ syncprov_matchops( Operation *op, opcookie *opc, > int saveit ) > op2.o_hdr = &oh; > op2.o_extra = op->o_extra; > op2.o_callback = NULL; > + paranoia = ss->s_op->ors_filter; > if (ss->s_flags & PS_FIX_FILTER) { > /* Skip the AND/GE clause that we stuck on in front. We > would lose deletes/mods that happen during the refresh > @@ -1311,7 +1313,11 @@ syncprov_matchops( Operation *op, opcookie *opc, > int saveit ) > op2.ors_filter = ss->s_op->ors_filter->f_and->f_next; > } > ldap_pvt_thread_mutex_unlock( &ss->s_mutex ); > + assert (paranoia == ss->s_op->ors_filter || paranoia == > ss->s_op->ors_filter->f_and->f_next); > + usleep(1000); > + assert (paranoia == ss->s_op->ors_filter || paranoia == > ss->s_op->ors_filter->f_and->f_next); > rc = test_filter( &op2, e, op2.ors_filter ); > + assert (paranoia == ss->s_op->ors_filter || paranoia == > ss->s_op->ors_filter->f_and->f_next); > } > > Debug( LDAP_DEBUG_TRACE, "syncprov_matchops: sid %03x fscope > %d rc %d\n", > > Updated patch attached. > Please review and merge. > > Leonid. > > --- > > The attached files is derived from OpenLDAP Software. All of the > modifications > to OpenLDAP Software represented in the following patch(es) were > developed by > Peter-Service LLC, Moscow, Russia. Peter-Service LLC has not assigned > rights > and/or interest in this work to any party. I, Leonid Yuriev am > authorized by > Peter-Service LLC, my employer, to release this work under the following > terms. > > Peter-Service LLC hereby places the following modifications to OpenLDAP > Software > (and only these modifications) into the public domain. Hence, these > modifications may be freely used and/or redistributed for any purpose > with or without attribution and/or other notice. > -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#8014) minor memleak in slapadd
by hyc＠symas.com 03 Jan '15

03 Jan '15

leo(a)yuriev.ru wrote: > Full_Name: Leonid Yuriev > Version: 2.4-HEAD > OS: RHEL7 > URL: ftp://ftp.openldap.org/incoming/ > Submission from: (NULL) (31.130.36.33) > > > Minor memleak was found by valgrind tool. > Patch will be available shortly. Thanks for the report. Fixed in master. > > Leonid. > > -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#8013) SIGSEGV in test_filter()
by leo＠yuriev.ru 03 Jan '15

03 Jan '15

This is a multi-part message in MIME format. --------------070009030106040804000907 Content-Type: text/plain; charset=windows-1251; format=flowed Content-Transfer-Encoding: 7bit 04.01.2015 02:47, Howard Chu wrote: > The patch is wrong. syncprov_matchops can be called twice for the same > operation; toggling the flag where you've placed it means the filter > will be incorrect on the 2nd invocation as well as on all subsequent > invocations. Ok, but found another case. The ss->s_op->ors_filter may be updated immediately after the s_mutex released. This is a simple change for reproducing the bug. diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c index 5ef2eaa..f579faa 100644 --- a/servers/slapd/overlays/syncprov.c +++ b/servers/slapd/overlays/syncprov.c @@ -1295,6 +1295,7 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit ) } if ( fc.fscope ) { + Filter *paranoia; ldap_pvt_thread_mutex_lock( &ss->s_mutex ); op2 = *ss->s_op; oh = *op->o_hdr; @@ -1304,6 +1305,7 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit ) op2.o_hdr = &oh; op2.o_extra = op->o_extra; op2.o_callback = NULL; + paranoia = ss->s_op->ors_filter; if (ss->s_flags & PS_FIX_FILTER) { /* Skip the AND/GE clause that we stuck on in front. We would lose deletes/mods that happen during the refresh @@ -1311,7 +1313,11 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit ) op2.ors_filter = ss->s_op->ors_filter->f_and->f_next; } ldap_pvt_thread_mutex_unlock( &ss->s_mutex ); + assert (paranoia == ss->s_op->ors_filter || paranoia == ss->s_op->ors_filter->f_and->f_next); + usleep(1000); + assert (paranoia == ss->s_op->ors_filter || paranoia == ss->s_op->ors_filter->f_and->f_next); rc = test_filter( &op2, e, op2.ors_filter ); + assert (paranoia == ss->s_op->ors_filter || paranoia == ss->s_op->ors_filter->f_and->f_next); } Debug( LDAP_DEBUG_TRACE, "syncprov_matchops: sid %03x fscope %d rc %d\n", Updated patch attached. Please review and merge. Leonid. --- The attached files is derived from OpenLDAP Software. All of the modifications to OpenLDAP Software represented in the following patch(es) were developed by Peter-Service LLC, Moscow, Russia. Peter-Service LLC has not assigned rights and/or interest in this work to any party. I, Leonid Yuriev am authorized by Peter-Service LLC, my employer, to release this work under the following terms. Peter-Service LLC hereby places the following modifications to OpenLDAP Software (and only these modifications) into the public domain. Hence, these modifications may be freely used and/or redistributed for any purpose with or without attribution and/or other notice. --------------070009030106040804000907 Content-Type: text/x-patch; name="its8013.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="its8013.patch" commit 5014e0b526e68c21bcfd9a9dd43d154d621f7476 Author: Leo Yuriev <leo(a)yuriev.ru> Date: 2015-01-01 16:44:50 +0300 ITS#8013 fix rare SIGSEGV in test_filter(). Filter may be updated/fixed and freed in other thread immediately after release the s_mutex, while the test_filter() running. Also now specifically damaged filter fields when it freed. This will enable faster detection of such errors (fail-fast by SIGSEGV). diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c index b859f73..f440336 100644 --- a/servers/slapd/filter.c +++ b/servers/slapd/filter.c @@ -566,6 +566,8 @@ filter_free_x( Operation *op, Filter *f, int freeme ) break; } + f->f_next = (void*) -1l; + f->f_un.f_un_complex = (void*) -1l; if ( freeme ) { op->o_tmpfree( f, op->o_tmpmemctx ); } diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c index 5ef2eaa..2369edb 100644 --- a/servers/slapd/overlays/syncprov.c +++ b/servers/slapd/overlays/syncprov.c @@ -1304,14 +1304,17 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit ) op2.o_hdr = &oh; op2.o_extra = op->o_extra; op2.o_callback = NULL; - if (ss->s_flags & PS_FIX_FILTER) { + if ( ss->s_flags & PS_FIX_FILTER ) { /* Skip the AND/GE clause that we stuck on in front. We would lose deletes/mods that happen during the refresh phase otherwise (ITS#6555) */ - op2.ors_filter = ss->s_op->ors_filter->f_and->f_next; + op2.ors_filter = filter_dup( op2.ors_filter->f_and->f_next, NULL ); + } else { + op2.ors_filter = filter_dup( op2.ors_filter, NULL ); } ldap_pvt_thread_mutex_unlock( &ss->s_mutex ); rc = test_filter( &op2, e, op2.ors_filter ); + filter_free( op2.ors_filter ); } Debug( LDAP_DEBUG_TRACE, "syncprov_matchops: sid %03x fscope %d rc %d\n", @@ -2237,6 +2240,7 @@ syncprov_detach_op( Operation *op, syncops *so, slap_overinst *on ) /* Skip the AND/GE clause that we stuck on in front */ if ( so->s_flags & PS_FIX_FILTER ) { + assert(op2->ors_filter->f_choice == LDAP_FILTER_AND); op2->ors_filter = op->ors_filter->f_and->f_next; so->s_flags ^= PS_FIX_FILTER; } else { @@ -2390,7 +2394,6 @@ syncprov_search_response( Operation *op, SlapReply *rs ) ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); /* syncprov_ab_cleanup will free this syncop */ return SLAPD_ABANDON; - } else { ldap_pvt_thread_mutex_lock( &ss->ss_so->s_mutex ); /* Turn off the refreshing flag */ --------------070009030106040804000907--

1 0

Re: (ITS#8013) SIGSEGV in test_filter()
by hyc＠symas.com 03 Jan '15

03 Jan '15

Leonid Yuriev wrote: > Please review attached patch and merge. The patch is wrong. syncprov_matchops can be called twice for the same operation; toggling the flag where you've placed it means the filter will be incorrect on the 2nd invocation as well as on all subsequent invocations. > > Leonid. > > --- > > The attached files is derived from OpenLDAP Software. All of the > modifications > to OpenLDAP Software represented in the following patch(es) were > developed by > Peter-Service LLC, Moscow, Russia. Peter-Service LLC has not assigned > rights > and/or interest in this work to any party. I, Leonid Yuriev am > authorized by > Peter-Service LLC, my employer, to release this work under the following > terms. > > Peter-Service LLC hereby places the following modifications to OpenLDAP > Software > (and only these modifications) into the public domain. Hence, these > modifications may be freely used and/or redistributed for any purpose > with or without attribution and/or other notice. -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#8015) memcpy() overlapping in many places
by hyc＠symas.com 03 Jan '15

03 Jan '15

kurt(a)OpenLDAP.org wrote: > AC_MEMCPY is generally memove(3). It would only be memcpy(3) if both = > memmove(3) or bcopy(3) were not available. So at most your patch will = > cause link errors. Closing this ITS. The patch is obviously invalid. > > =E2=80=94 Kurt > >> On Jan 3, 2015, at 11:21 AM, leo(a)yuriev.ru wrote: >> =20 >> This is a multi-part message in MIME format. >> --------------090408030902080204080503 >> Content-Type: text/plain; charset=3Dwindows-1251; format=3Dflowed >> Content-Transfer-Encoding: 7bit >> =20 >> Please review and merge. >> =20 >> Leonid. >> =20 >> =20 >> --------------090408030902080204080503 >> Content-Type: text/x-patch; >> name=3D"its8015.patch" >> Content-Transfer-Encoding: 7bit >> Content-Disposition: attachment; >> filename=3D"its8015.patch" >> =20 >> commit 8d55a7c88c6655879ffc677e5a9873f29bb7a802 >> Author: Leo Yuriev <leo(a)yuriev.ru> >> Date: 2015-01-01 16:00:58 +0300 >> =20 >> ITS#8015 replace memcpy() by memmove() for overlapped src & dst. >> =20 >> http://lwn.net/Articles/414467/ >> =20 >> Initially a few cases have been detected using Valgrind. >> After that I manually reviewed all calls memcpy() and AC_MEMCPY() >> it the 2.4 branch. >> =20 >> Unfortunately, we can not expect that all of these mistakes >> corrected, but it is much more than nothing. >> =20 >> diff --git a/libraries/liblber/encode.c b/libraries/liblber/encode.c >> index e39fa07..3eb15c6 100644 >> --- a/libraries/liblber/encode.c >> +++ b/libraries/liblber/encode.c >> @@ -398,7 +398,7 @@ ber_start_seqorset( >> return -1; >> } >> dest =3D *p; >> - AC_MEMCPY( dest, headptr, headlen ); >> + memmove( dest, headptr, headlen ); >> ber->ber_sos_ptr =3D dest + headlen; >> =20 >> ber->ber_sos_inner =3D dest + taglen - ber->ber_buf; >> @@ -467,7 +467,7 @@ ber_put_seqorset( BerElement *ber ) >> if ( unused !=3D 0 ) { >> /* length(length) < the reserved SOS_LENLEN = > bytes */ >> xlen -=3D unused; >> - AC_MEMCPY( lenptr, p, xlen ); >> + memmove( lenptr, p, xlen ); >> ber->ber_sos_ptr =3D (char *) lenptr + xlen; >> } >> } >> diff --git a/libraries/libldap/sasl.c b/libraries/libldap/sasl.c >> index 8878d1f..4ad605f 100644 >> --- a/libraries/libldap/sasl.c >> +++ b/libraries/libldap/sasl.c >> @@ -628,7 +628,7 @@ sb_sasl_generic_drop_packet ( >> =20 >> len =3D p->sec_buf_in.buf_ptr - p->sec_buf_in.buf_end; >> if ( len > 0 ) >> - AC_MEMCPY( p->sec_buf_in.buf_base, = > p->sec_buf_in.buf_base + >> + memmove( p->sec_buf_in.buf_base, p->sec_buf_in.buf_base = > + >> p->sec_buf_in.buf_end, len ); >> =20 >> if ( len >=3D 4 ) { >> diff --git a/libraries/liblutil/utils.c b/libraries/liblutil/utils.c >> index 310380b..a783167 100644 >> --- a/libraries/liblutil/utils.c >> +++ b/libraries/liblutil/utils.c >> @@ -841,7 +841,7 @@ lutil_str2bin( struct berval *in, struct berval = > *out, void *ctx ) >> num.buf[num.beg] =3D neg; >> } >> if ( num.beg ) >> - AC_MEMCPY( num.buf, num.buf+num.beg, num.len ); >> + memmove( num.buf, num.buf+num.beg, num.len ); >> out->bv_len =3D num.len; >> decfail: >> if ( tmp !=3D tmpbuf ) { >> diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c >> index f5c244c..f935efc 100644 >> --- a/servers/slapd/aclparse.c >> +++ b/servers/slapd/aclparse.c >> @@ -2317,7 +2317,7 @@ acl_regex_normalized_dn( >> for ( q =3D &p[2]; q[0] =3D=3D ' '; q++ ) { >> /* DO NOTHING */ ; >> } >> - AC_MEMCPY( p+1, q, len-(q-str)+1); >> + memmove( p+1, q, len-(q-str)+1); >> } >> } >> pattern->bv_val =3D str; >> diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c >> index 6f6cb2f..2357452 100644 >> --- a/servers/slapd/ad.c >> +++ b/servers/slapd/ad.c >> @@ -277,7 +277,7 @@ int slap_bv2ad( >> } else if ( rc > 0 || >> ( rc =3D=3D 0 && = > (unsigned)optlen > tags[i].bv_len )) >> { >> - AC_MEMCPY( &tags[i+2], = > &tags[i+1], >> + memmove( &tags[i+2], &tags[i+1], >> = > (ntags-i-1)*sizeof(struct berval) ); >> tags[i+1].bv_val =3D opt; >> tags[i+1].bv_len =3D optlen; >> @@ -286,7 +286,7 @@ int slap_bv2ad( >> } >> =20 >> if( ntags ) { >> - AC_MEMCPY( &tags[1], &tags[0], >> + memmove( &tags[1], &tags[0], >> ntags*sizeof(struct berval) ); >> } >> tags[0].bv_val =3D opt; >> diff --git a/servers/slapd/back-bdb/attr.c = > b/servers/slapd/back-bdb/attr.c >> index 2f183b3..e4ab16f 100644 >> --- a/servers/slapd/back-bdb/attr.c >> +++ b/servers/slapd/back-bdb/attr.c >> @@ -71,7 +71,7 @@ ainfo_insert( struct bdb_info *bdb, AttrInfo *a ) >> bdb->bi_attrs =3D ch_realloc( bdb->bi_attrs, ( bdb->bi_nattrs+1 = > ) *=20 >> sizeof( AttrInfo * )); >> if ( x < bdb->bi_nattrs ) >> - AC_MEMCPY( &bdb->bi_attrs[x+1], &bdb->bi_attrs[x], >> + memmove( &bdb->bi_attrs[x+1], &bdb->bi_attrs[x], >> ( bdb->bi_nattrs - x ) * sizeof( AttrInfo *)); >> bdb->bi_attrs[x] =3D a; >> bdb->bi_nattrs++; >> diff --git a/servers/slapd/back-bdb/idl.c = > b/servers/slapd/back-bdb/idl.c >> index c6bc9f3..f024245 100644 >> --- a/servers/slapd/back-bdb/idl.c >> +++ b/servers/slapd/back-bdb/idl.c >> @@ -204,7 +204,7 @@ int bdb_idl_insert( ID *ids, ID id ) >> =09 >> } else { >> /* insert id */ >> - AC_MEMCPY( &ids[x+1], &ids[x], (ids[0]-x) * sizeof(ID) = > ); >> + memmove( &ids[x+1], &ids[x], (ids[0]-x) * sizeof(ID) ); >> ids[x] =3D id; >> } >> =20 >> @@ -262,7 +262,7 @@ int bdb_idl_delete( ID *ids, ID id ) >> } >> =20 >> } else { >> - AC_MEMCPY( &ids[x], &ids[x+1], (1+ids[0]-x) * sizeof(ID) = > ); >> + memmove( &ids[x], &ids[x+1], (1+ids[0]-x) * sizeof(ID) = > ); >> } >> =20 >> #if IDL_DEBUG > 1 >> diff --git a/servers/slapd/back-ldap/config.c = > b/servers/slapd/back-ldap/config.c >> index 11a4ac4..4b5c394 100644 >> --- a/servers/slapd/back-ldap/config.c >> +++ b/servers/slapd/back-ldap/config.c >> @@ -1047,7 +1047,7 @@ ldap_back_cf_gen( ConfigArgs *c ) >> =20 >> if ( i ) { >> bv.bv_len -=3D i; >> - AC_MEMCPY( bv.bv_val, &bv.bv_val[ i ], >> + memmove( bv.bv_val, &bv.bv_val[ i ], >> bv.bv_len + 1 ); >> } >> =20 >> @@ -1239,7 +1239,7 @@ ldap_back_cf_gen( ConfigArgs *c ) >> =20 >> if ( i ) { >> bc.bv_len -=3D i; >> - AC_MEMCPY( bc.bv_val, = > &bc.bv_val[ i ], bc.bv_len + 1 ); >> + memmove( bc.bv_val, &bc.bv_val[ = > i ], bc.bv_len + 1 ); >> } >> =20 >> bv =3D bc; >> @@ -1298,7 +1298,7 @@ ldap_back_cf_gen( ConfigArgs *c ) >> =20 >> if ( i ) { >> bv.bv_len -=3D i; >> - AC_MEMCPY( bv.bv_val, &bv.bv_val[ i ], >> + memmove( bv.bv_val, &bv.bv_val[ i ], >> bv.bv_len + 1 ); >> } >> =20 >> diff --git a/servers/slapd/back-ldap/search.c = > b/servers/slapd/back-ldap/search.c >> index eeab466..b100510 100644 >> --- a/servers/slapd/back-ldap/search.c >> +++ b/servers/slapd/back-ldap/search.c >> @@ -109,7 +109,7 @@ ldap_back_munge_filter( >> =20 >> ptr =3D filter->bv_val + ( ptr - oldfilter.bv_val ); >> =20 >> - AC_MEMCPY( &ptr[ newbv->bv_len ], >> + memmove( &ptr[ newbv->bv_len ], >> &ptr[ oldbv->bv_len ],=20 >> oldfilter.bv_len - ( ptr - = > filter->bv_val ) - oldbv->bv_len + 1 ); >> AC_MEMCPY( ptr, newbv->bv_val, newbv->bv_len ); >> diff --git a/servers/slapd/back-mdb/attr.c = > b/servers/slapd/back-mdb/attr.c >> index 5da9da9..38e513e 100644 >> --- a/servers/slapd/back-mdb/attr.c >> +++ b/servers/slapd/back-mdb/attr.c >> @@ -71,7 +71,7 @@ ainfo_insert( struct mdb_info *mdb, AttrInfo *a ) >> mdb->mi_attrs =3D ch_realloc( mdb->mi_attrs, ( mdb->mi_nattrs+1 = > ) *=20 >> sizeof( AttrInfo * )); >> if ( x < mdb->mi_nattrs ) >> - AC_MEMCPY( &mdb->mi_attrs[x+1], &mdb->mi_attrs[x], >> + memmove( &mdb->mi_attrs[x+1], &mdb->mi_attrs[x], >> ( mdb->mi_nattrs - x ) * sizeof( AttrInfo *)); >> mdb->mi_attrs[x] =3D a; >> mdb->mi_nattrs++; >> diff --git a/servers/slapd/back-mdb/idl.c = > b/servers/slapd/back-mdb/idl.c >> index 3c2f986..c03f7c3 100644 >> --- a/servers/slapd/back-mdb/idl.c >> +++ b/servers/slapd/back-mdb/idl.c >> @@ -173,7 +173,7 @@ int mdb_idl_insert( ID *ids, ID id ) >> =09 >> } else { >> /* insert id */ >> - AC_MEMCPY( &ids[x+1], &ids[x], (ids[0]-x) * sizeof(ID) = > ); >> + memmove( &ids[x+1], &ids[x], (ids[0]-x) * sizeof(ID) ); >> ids[x] =3D id; >> } >> =20 >> @@ -231,7 +231,7 @@ static int mdb_idl_delete( ID *ids, ID id ) >> } >> =20 >> } else { >> - AC_MEMCPY( &ids[x], &ids[x+1], (1+ids[0]-x) * sizeof(ID) = > ); >> + memmove( &ids[x], &ids[x+1], (1+ids[0]-x) * sizeof(ID) = > ); >> } >> =20 >> #if IDL_DEBUG > 1 >> diff --git a/servers/slapd/back-meta/config.c = > b/servers/slapd/back-meta/config.c >> index e3164b0..daa5e8b 100644 >> --- a/servers/slapd/back-meta/config.c >> +++ b/servers/slapd/back-meta/config.c >> @@ -1340,7 +1340,7 @@ meta_back_cf_gen( ConfigArgs *c ) >> =20 >> if ( i ) { >> bv.bv_len -=3D i; >> - AC_MEMCPY( bv.bv_val, &bv.bv_val[ i ], >> + memmove( bv.bv_val, &bv.bv_val[ i ], >> bv.bv_len + 1 ); >> } >> =20 >> @@ -1597,7 +1597,7 @@ meta_back_cf_gen( ConfigArgs *c ) >> =20 >> if ( i ) { >> bc.bv_len -=3D i; >> - AC_MEMCPY( bc.bv_val, = > &bc.bv_val[ i ], bc.bv_len + 1 ); >> + memmove( bc.bv_val, &bc.bv_val[ = > i ], bc.bv_len + 1 ); >> } >> =20 >> bv =3D bc; >> @@ -2720,7 +2720,7 @@ idassert-authzFrom "dn:<rootdn>" >> int len =3D strlen( argv[ 0 ] ); >> =20 >> ber_str2bv( line, 0, 0, &bv ); >> - AC_MEMCPY( &bv.bv_val[ len ], &bv.bv_val[ len + = > 1 ], >> + memmove( &bv.bv_val[ len ], &bv.bv_val[ len + 1 = > ], >> bv.bv_len - ( len + 1 )); >> bv.bv_val[ bv.bv_len - 1] =3D '"'; >> ber_bvarray_add( &mt->mt_rwmap.rwm_bva_rewrite, = > &bv ); >> diff --git a/servers/slapd/back-sql/util.c = > b/servers/slapd/back-sql/util.c >> index 3564527..7c77964 100644 >> --- a/servers/slapd/back-sql/util.c >> +++ b/servers/slapd/back-sql/util.c >> @@ -411,7 +411,7 @@ backsql_split_pattern( >> =20 >> } else if ( real_end[ 1 ] =3D=3D SPLIT_CHAR ) { >> expected++; >> - AC_MEMCPY( real_end, real_end + 1, strlen( = > real_end ) ); >> + memmove( real_end, real_end + 1, strlen( = > real_end ) ); >> end =3D strchr( real_end + 1, SPLIT_CHAR ); >> continue; >> } >> diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c >> index 2214334..9655629 100644 >> --- a/servers/slapd/bconfig.c >> +++ b/servers/slapd/bconfig.c >> @@ -2353,7 +2353,7 @@ sortval_reject: >> s =3D ber_bvchr( &bv, '"' ); >> assert( s !=3D NULL ); >> /* move the trailing quote of = > argv[0] to the end */ >> - AC_MEMCPY( s, s + 1, bv.bv_len - = > ( s - bv.bv_val ) ); >> + memmove( s, s + 1, bv.bv_len - ( = > s - bv.bv_val ) ); >> bv.bv_val[ bv.bv_len - 1 ] =3D = > '"'; >> =20 >> } else { >> diff --git a/servers/slapd/config.c b/servers/slapd/config.c >> index cdc17d9..5c0dd55 100644 >> --- a/servers/slapd/config.c >> +++ b/servers/slapd/config.c >> @@ -2159,12 +2159,12 @@ strtok_quote( char *line, char *sep, char = > **quote_ptr ) >> } else { >> inquote =3D 1; >> } >> - AC_MEMCPY( next, next + 1, strlen( next + 1 ) + = > 1 ); >> + memmove( next, next + 1, strlen( next + 1 ) + 1 = > ); >> break; >> =20 >> case '\\': >> if ( next[1] ) >> - AC_MEMCPY( next, >> + memmove( next, >> next + 1, strlen( next + 1 ) = > + 1 ); >> next++; /* dont parse the escaped = > character */ >> break; >> diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c >> index 9b51f95..6b1f1d7 100644 >> --- a/servers/slapd/controls.c >> +++ b/servers/slapd/controls.c >> @@ -1005,7 +1005,7 @@ slap_remove_control( >> op->o_tmpfree( op->o_ctrls[ j ], op->o_tmpmemctx ); >> =20 >> if ( i > 1 ) { >> - AC_MEMCPY( &op->o_ctrls[ j ], &op->o_ctrls[ j + = > 1 ], >> + memmove( &op->o_ctrls[ j ], &op->o_ctrls[ j + 1 = > ], >> ( i - j ) * sizeof( LDAPControl * ) ); >> =20 >> } else { >> diff --git a/servers/slapd/overlays/constraint.c = > b/servers/slapd/overlays/constraint.c >> index 096f32a..99844a5 100644 >> --- a/servers/slapd/overlays/constraint.c >> +++ b/servers/slapd/overlays/constraint.c >> @@ -401,7 +401,7 @@ constraint_cf_gen( ConfigArgs *c ) >> rc =3D ARG_BAD_CONF; >> goto done; >> } >> - AC_MEMCPY( = > &ap.lud->lud_filter[0], &ap.lud->lud_filter[1], len - 2 ); >> + memmove( &ap.lud->lud_filter[0], = > &ap.lud->lud_filter[1], len - 2 ); >> ap.lud->lud_filter[len - 2] =3D = > '\0'; >> } >> =20 >> diff --git a/servers/slapd/overlays/memberof.c = > b/servers/slapd/overlays/memberof.c >> index 17cbae7..dcfb047 100644 >> --- a/servers/slapd/overlays/memberof.c >> +++ b/servers/slapd/overlays/memberof.c >> @@ -616,10 +616,10 @@ memberof_op_add( Operation *op, SlapReply *rs ) >> break; >> } >> =09 >> - AC_MEMCPY( &a->a_vals[ i ], = > &a->a_vals[ i + 1 ], >> + memmove( &a->a_vals[ i ], = > &a->a_vals[ i + 1 ], >> sizeof( struct berval ) = > * ( j - i ) ); >> if ( a->a_nvals !=3D a->a_vals ) = > { >> - AC_MEMCPY( &a->a_nvals[ = > i ], &a->a_nvals[ i + 1 ], >> + memmove( &a->a_nvals[ i = > ], &a->a_nvals[ i + 1 ], >> sizeof( struct = > berval ) * ( j - i ) ); >> } >> i--; >> @@ -698,10 +698,10 @@ memberof_op_add( Operation *op, SlapReply *rs ) >> break; >> } >> =09 >> - AC_MEMCPY( &a->a_vals[ i ], = > &a->a_vals[ i + 1 ], >> + memmove( &a->a_vals[ i ], = > &a->a_vals[ i + 1 ], >> sizeof( struct berval ) = > * ( j - i ) ); >> if ( a->a_nvals !=3D a->a_vals ) = > { >> - AC_MEMCPY( &a->a_nvals[ = > i ], &a->a_nvals[ i + 1 ], >> + memmove( &a->a_nvals[ i = > ], &a->a_nvals[ i + 1 ], >> sizeof( struct = > berval ) * ( j - i ) ); >> } >> i--; >> @@ -922,9 +922,9 @@ memberof_op_modify( Operation *op, SlapReply *rs ) >> break; >> } >> =09 >> - AC_MEMCPY( = > &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], >> + memmove( = > &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], >> sizeof( = > struct berval ) * ( j - i ) ); >> - AC_MEMCPY( = > &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], >> + memmove( = > &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], >> sizeof( = > struct berval ) * ( j - i ) ); >> i--; >> } >> @@ -1022,10 +1022,10 @@ memberof_op_modify( Operation *op, SlapReply = > *rs ) >> break; >> } >> =09 >> - AC_MEMCPY( = > &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], >> + memmove( = > &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], >> sizeof( = > struct berval ) * ( j - i ) ); >> if ( = > ml->sml_nvalues !=3D ml->sml_values ) { >> - = > AC_MEMCPY( &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], >> + memmove( = > &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], >> = > sizeof( struct berval ) * ( j - i ) ); >> } >> i--; >> @@ -1140,10 +1140,10 @@ memberof_op_modify( Operation *op, SlapReply = > *rs ) >> break; >> } >> =09 >> - AC_MEMCPY( = > &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], >> + memmove( = > &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], >> sizeof( struct = > berval ) * ( j - i ) ); >> if ( ml->sml_nvalues !=3D = > ml->sml_values ) { >> - AC_MEMCPY( = > &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], >> + memmove( = > &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], >> sizeof( = > struct berval ) * ( j - i ) ); >> } >> i--; >> diff --git a/servers/slapd/overlays/rwm.c = > b/servers/slapd/overlays/rwm.c >> index 1fbfac3..22a536a 100644 >> --- a/servers/slapd/overlays/rwm.c >> +++ b/servers/slapd/overlays/rwm.c >> @@ -2014,7 +2014,7 @@ rwm_bva_add( >> int len =3D strlen( argv[ 0 ] ); >> =20 >> ber_str2bv( line, 0, 0, &bv ); >> - AC_MEMCPY( &bv.bv_val[ len ], &bv.bv_val[ len + 1 ], >> + memmove( &bv.bv_val[ len ], &bv.bv_val[ len + 1 ], >> bv.bv_len - ( len + 1 ) ); >> bv.bv_val[ bv.bv_len - 1 ] =3D '"'; >> =20 >> diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c >> index b47a528..7436614 100644 >> --- a/servers/slapd/sasl.c >> +++ b/servers/slapd/sasl.c >> @@ -1342,7 +1342,7 @@ slap_sasl_peer2ipport( struct berval *peer ) >> *p =3D ';'; >> if ( isv6 ) { >> assert( p[-1] =3D=3D ']' ); >> - AC_MEMCPY( &p[-1], p, plen - ( p - ipport ) + 1 = > ); >> + memmove( &p[-1], p, plen - ( p - ipport ) + 1 ); >> } >> =20 >> } else if ( isv6 ) { >> diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c >> index 5e0ebbe..5449603 100644 >> --- a/servers/slapd/saslauthz.c >> +++ b/servers/slapd/saslauthz.c >> @@ -182,14 +182,14 @@ int slap_parse_user( struct berval *id, struct = > berval *user, >> if ( !BER_BVISNULL( mech ) ) { >> assert( mech->bv_val =3D=3D id->bv_val + 2 ); >> =20 >> - AC_MEMCPY( mech->bv_val - 2, mech->bv_val, mech->bv_len = > + 1 ); >> + memmove( mech->bv_val - 2, mech->bv_val, mech->bv_len + = > 1 ); >> mech->bv_val -=3D 2; >> } >> =20 >> if ( !BER_BVISNULL( realm ) ) { >> assert( realm->bv_val >=3D id->bv_val + 2 ); >> =20 >> - AC_MEMCPY( realm->bv_val - 2, realm->bv_val, = > realm->bv_len + 1 ); >> + memmove( realm->bv_val - 2, realm->bv_val, realm->bv_len = > + 1 ); >> realm->bv_val -=3D 2; >> } >> =20 >> =20 >> --------------090408030902080204080503-- >> =20 >> =20 >> =20 > > > > > -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#8015) memcpy() overlapping in many places
by kurt＠OpenLDAP.org 03 Jan '15

03 Jan '15

AC_MEMCPY is generally memove(3). It would only be memcpy(3) if both = memmove(3) or bcopy(3) were not available. So at most your patch will = cause link errors. =E2=80=94 Kurt > On Jan 3, 2015, at 11:21 AM, leo(a)yuriev.ru wrote: >=20 > This is a multi-part message in MIME format. > --------------090408030902080204080503 > Content-Type: text/plain; charset=3Dwindows-1251; format=3Dflowed > Content-Transfer-Encoding: 7bit >=20 > Please review and merge. >=20 > Leonid. >=20 >=20 > --------------090408030902080204080503 > Content-Type: text/x-patch; > name=3D"its8015.patch" > Content-Transfer-Encoding: 7bit > Content-Disposition: attachment; > filename=3D"its8015.patch" >=20 > commit 8d55a7c88c6655879ffc677e5a9873f29bb7a802 > Author: Leo Yuriev <leo(a)yuriev.ru> > Date: 2015-01-01 16:00:58 +0300 >=20 > ITS#8015 replace memcpy() by memmove() for overlapped src & dst. >=20 > http://lwn.net/Articles/414467/ >=20 > Initially a few cases have been detected using Valgrind. > After that I manually reviewed all calls memcpy() and AC_MEMCPY() > it the 2.4 branch. >=20 > Unfortunately, we can not expect that all of these mistakes > corrected, but it is much more than nothing. >=20 > diff --git a/libraries/liblber/encode.c b/libraries/liblber/encode.c > index e39fa07..3eb15c6 100644 > --- a/libraries/liblber/encode.c > +++ b/libraries/liblber/encode.c > @@ -398,7 +398,7 @@ ber_start_seqorset( > return -1; > } > dest =3D *p; > - AC_MEMCPY( dest, headptr, headlen ); > + memmove( dest, headptr, headlen ); > ber->ber_sos_ptr =3D dest + headlen; >=20 > ber->ber_sos_inner =3D dest + taglen - ber->ber_buf; > @@ -467,7 +467,7 @@ ber_put_seqorset( BerElement *ber ) > if ( unused !=3D 0 ) { > /* length(length) < the reserved SOS_LENLEN = bytes */ > xlen -=3D unused; > - AC_MEMCPY( lenptr, p, xlen ); > + memmove( lenptr, p, xlen ); > ber->ber_sos_ptr =3D (char *) lenptr + xlen; > } > } > diff --git a/libraries/libldap/sasl.c b/libraries/libldap/sasl.c > index 8878d1f..4ad605f 100644 > --- a/libraries/libldap/sasl.c > +++ b/libraries/libldap/sasl.c > @@ -628,7 +628,7 @@ sb_sasl_generic_drop_packet ( >=20 > len =3D p->sec_buf_in.buf_ptr - p->sec_buf_in.buf_end; > if ( len > 0 ) > - AC_MEMCPY( p->sec_buf_in.buf_base, = p->sec_buf_in.buf_base + > + memmove( p->sec_buf_in.buf_base, p->sec_buf_in.buf_base = + > p->sec_buf_in.buf_end, len ); >=20 > if ( len >=3D 4 ) { > diff --git a/libraries/liblutil/utils.c b/libraries/liblutil/utils.c > index 310380b..a783167 100644 > --- a/libraries/liblutil/utils.c > +++ b/libraries/liblutil/utils.c > @@ -841,7 +841,7 @@ lutil_str2bin( struct berval *in, struct berval = *out, void *ctx ) > num.buf[num.beg] =3D neg; > } > if ( num.beg ) > - AC_MEMCPY( num.buf, num.buf+num.beg, num.len ); > + memmove( num.buf, num.buf+num.beg, num.len ); > out->bv_len =3D num.len; > decfail: > if ( tmp !=3D tmpbuf ) { > diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c > index f5c244c..f935efc 100644 > --- a/servers/slapd/aclparse.c > +++ b/servers/slapd/aclparse.c > @@ -2317,7 +2317,7 @@ acl_regex_normalized_dn( > for ( q =3D &p[2]; q[0] =3D=3D ' '; q++ ) { > /* DO NOTHING */ ; > } > - AC_MEMCPY( p+1, q, len-(q-str)+1); > + memmove( p+1, q, len-(q-str)+1); > } > } > pattern->bv_val =3D str; > diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c > index 6f6cb2f..2357452 100644 > --- a/servers/slapd/ad.c > +++ b/servers/slapd/ad.c > @@ -277,7 +277,7 @@ int slap_bv2ad( > } else if ( rc > 0 || > ( rc =3D=3D 0 && = (unsigned)optlen > tags[i].bv_len )) > { > - AC_MEMCPY( &tags[i+2], = &tags[i+1], > + memmove( &tags[i+2], &tags[i+1], > = (ntags-i-1)*sizeof(struct berval) ); > tags[i+1].bv_val =3D opt; > tags[i+1].bv_len =3D optlen; > @@ -286,7 +286,7 @@ int slap_bv2ad( > } >=20 > if( ntags ) { > - AC_MEMCPY( &tags[1], &tags[0], > + memmove( &tags[1], &tags[0], > ntags*sizeof(struct berval) ); > } > tags[0].bv_val =3D opt; > diff --git a/servers/slapd/back-bdb/attr.c = b/servers/slapd/back-bdb/attr.c > index 2f183b3..e4ab16f 100644 > --- a/servers/slapd/back-bdb/attr.c > +++ b/servers/slapd/back-bdb/attr.c > @@ -71,7 +71,7 @@ ainfo_insert( struct bdb_info *bdb, AttrInfo *a ) > bdb->bi_attrs =3D ch_realloc( bdb->bi_attrs, ( bdb->bi_nattrs+1 = ) *=20 > sizeof( AttrInfo * )); > if ( x < bdb->bi_nattrs ) > - AC_MEMCPY( &bdb->bi_attrs[x+1], &bdb->bi_attrs[x], > + memmove( &bdb->bi_attrs[x+1], &bdb->bi_attrs[x], > ( bdb->bi_nattrs - x ) * sizeof( AttrInfo *)); > bdb->bi_attrs[x] =3D a; > bdb->bi_nattrs++; > diff --git a/servers/slapd/back-bdb/idl.c = b/servers/slapd/back-bdb/idl.c > index c6bc9f3..f024245 100644 > --- a/servers/slapd/back-bdb/idl.c > +++ b/servers/slapd/back-bdb/idl.c > @@ -204,7 +204,7 @@ int bdb_idl_insert( ID *ids, ID id ) > =09 > } else { > /* insert id */ > - AC_MEMCPY( &ids[x+1], &ids[x], (ids[0]-x) * sizeof(ID) = ); > + memmove( &ids[x+1], &ids[x], (ids[0]-x) * sizeof(ID) ); > ids[x] =3D id; > } >=20 > @@ -262,7 +262,7 @@ int bdb_idl_delete( ID *ids, ID id ) > } >=20 > } else { > - AC_MEMCPY( &ids[x], &ids[x+1], (1+ids[0]-x) * sizeof(ID) = ); > + memmove( &ids[x], &ids[x+1], (1+ids[0]-x) * sizeof(ID) = ); > } >=20 > #if IDL_DEBUG > 1 > diff --git a/servers/slapd/back-ldap/config.c = b/servers/slapd/back-ldap/config.c > index 11a4ac4..4b5c394 100644 > --- a/servers/slapd/back-ldap/config.c > +++ b/servers/slapd/back-ldap/config.c > @@ -1047,7 +1047,7 @@ ldap_back_cf_gen( ConfigArgs *c ) >=20 > if ( i ) { > bv.bv_len -=3D i; > - AC_MEMCPY( bv.bv_val, &bv.bv_val[ i ], > + memmove( bv.bv_val, &bv.bv_val[ i ], > bv.bv_len + 1 ); > } >=20 > @@ -1239,7 +1239,7 @@ ldap_back_cf_gen( ConfigArgs *c ) >=20 > if ( i ) { > bc.bv_len -=3D i; > - AC_MEMCPY( bc.bv_val, = &bc.bv_val[ i ], bc.bv_len + 1 ); > + memmove( bc.bv_val, &bc.bv_val[ = i ], bc.bv_len + 1 ); > } >=20 > bv =3D bc; > @@ -1298,7 +1298,7 @@ ldap_back_cf_gen( ConfigArgs *c ) >=20 > if ( i ) { > bv.bv_len -=3D i; > - AC_MEMCPY( bv.bv_val, &bv.bv_val[ i ], > + memmove( bv.bv_val, &bv.bv_val[ i ], > bv.bv_len + 1 ); > } >=20 > diff --git a/servers/slapd/back-ldap/search.c = b/servers/slapd/back-ldap/search.c > index eeab466..b100510 100644 > --- a/servers/slapd/back-ldap/search.c > +++ b/servers/slapd/back-ldap/search.c > @@ -109,7 +109,7 @@ ldap_back_munge_filter( >=20 > ptr =3D filter->bv_val + ( ptr - oldfilter.bv_val ); >=20 > - AC_MEMCPY( &ptr[ newbv->bv_len ], > + memmove( &ptr[ newbv->bv_len ], > &ptr[ oldbv->bv_len ],=20 > oldfilter.bv_len - ( ptr - = filter->bv_val ) - oldbv->bv_len + 1 ); > AC_MEMCPY( ptr, newbv->bv_val, newbv->bv_len ); > diff --git a/servers/slapd/back-mdb/attr.c = b/servers/slapd/back-mdb/attr.c > index 5da9da9..38e513e 100644 > --- a/servers/slapd/back-mdb/attr.c > +++ b/servers/slapd/back-mdb/attr.c > @@ -71,7 +71,7 @@ ainfo_insert( struct mdb_info *mdb, AttrInfo *a ) > mdb->mi_attrs =3D ch_realloc( mdb->mi_attrs, ( mdb->mi_nattrs+1 = ) *=20 > sizeof( AttrInfo * )); > if ( x < mdb->mi_nattrs ) > - AC_MEMCPY( &mdb->mi_attrs[x+1], &mdb->mi_attrs[x], > + memmove( &mdb->mi_attrs[x+1], &mdb->mi_attrs[x], > ( mdb->mi_nattrs - x ) * sizeof( AttrInfo *)); > mdb->mi_attrs[x] =3D a; > mdb->mi_nattrs++; > diff --git a/servers/slapd/back-mdb/idl.c = b/servers/slapd/back-mdb/idl.c > index 3c2f986..c03f7c3 100644 > --- a/servers/slapd/back-mdb/idl.c > +++ b/servers/slapd/back-mdb/idl.c > @@ -173,7 +173,7 @@ int mdb_idl_insert( ID *ids, ID id ) > =09 > } else { > /* insert id */ > - AC_MEMCPY( &ids[x+1], &ids[x], (ids[0]-x) * sizeof(ID) = ); > + memmove( &ids[x+1], &ids[x], (ids[0]-x) * sizeof(ID) ); > ids[x] =3D id; > } >=20 > @@ -231,7 +231,7 @@ static int mdb_idl_delete( ID *ids, ID id ) > } >=20 > } else { > - AC_MEMCPY( &ids[x], &ids[x+1], (1+ids[0]-x) * sizeof(ID) = ); > + memmove( &ids[x], &ids[x+1], (1+ids[0]-x) * sizeof(ID) = ); > } >=20 > #if IDL_DEBUG > 1 > diff --git a/servers/slapd/back-meta/config.c = b/servers/slapd/back-meta/config.c > index e3164b0..daa5e8b 100644 > --- a/servers/slapd/back-meta/config.c > +++ b/servers/slapd/back-meta/config.c > @@ -1340,7 +1340,7 @@ meta_back_cf_gen( ConfigArgs *c ) >=20 > if ( i ) { > bv.bv_len -=3D i; > - AC_MEMCPY( bv.bv_val, &bv.bv_val[ i ], > + memmove( bv.bv_val, &bv.bv_val[ i ], > bv.bv_len + 1 ); > } >=20 > @@ -1597,7 +1597,7 @@ meta_back_cf_gen( ConfigArgs *c ) >=20 > if ( i ) { > bc.bv_len -=3D i; > - AC_MEMCPY( bc.bv_val, = &bc.bv_val[ i ], bc.bv_len + 1 ); > + memmove( bc.bv_val, &bc.bv_val[ = i ], bc.bv_len + 1 ); > } >=20 > bv =3D bc; > @@ -2720,7 +2720,7 @@ idassert-authzFrom "dn:<rootdn>" > int len =3D strlen( argv[ 0 ] ); >=20 > ber_str2bv( line, 0, 0, &bv ); > - AC_MEMCPY( &bv.bv_val[ len ], &bv.bv_val[ len + = 1 ], > + memmove( &bv.bv_val[ len ], &bv.bv_val[ len + 1 = ], > bv.bv_len - ( len + 1 )); > bv.bv_val[ bv.bv_len - 1] =3D '"'; > ber_bvarray_add( &mt->mt_rwmap.rwm_bva_rewrite, = &bv ); > diff --git a/servers/slapd/back-sql/util.c = b/servers/slapd/back-sql/util.c > index 3564527..7c77964 100644 > --- a/servers/slapd/back-sql/util.c > +++ b/servers/slapd/back-sql/util.c > @@ -411,7 +411,7 @@ backsql_split_pattern( >=20 > } else if ( real_end[ 1 ] =3D=3D SPLIT_CHAR ) { > expected++; > - AC_MEMCPY( real_end, real_end + 1, strlen( = real_end ) ); > + memmove( real_end, real_end + 1, strlen( = real_end ) ); > end =3D strchr( real_end + 1, SPLIT_CHAR ); > continue; > } > diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c > index 2214334..9655629 100644 > --- a/servers/slapd/bconfig.c > +++ b/servers/slapd/bconfig.c > @@ -2353,7 +2353,7 @@ sortval_reject: > s =3D ber_bvchr( &bv, '"' ); > assert( s !=3D NULL ); > /* move the trailing quote of = argv[0] to the end */ > - AC_MEMCPY( s, s + 1, bv.bv_len - = ( s - bv.bv_val ) ); > + memmove( s, s + 1, bv.bv_len - ( = s - bv.bv_val ) ); > bv.bv_val[ bv.bv_len - 1 ] =3D = '"'; >=20 > } else { > diff --git a/servers/slapd/config.c b/servers/slapd/config.c > index cdc17d9..5c0dd55 100644 > --- a/servers/slapd/config.c > +++ b/servers/slapd/config.c > @@ -2159,12 +2159,12 @@ strtok_quote( char *line, char *sep, char = **quote_ptr ) > } else { > inquote =3D 1; > } > - AC_MEMCPY( next, next + 1, strlen( next + 1 ) + = 1 ); > + memmove( next, next + 1, strlen( next + 1 ) + 1 = ); > break; >=20 > case '\\': > if ( next[1] ) > - AC_MEMCPY( next, > + memmove( next, > next + 1, strlen( next + 1 ) = + 1 ); > next++; /* dont parse the escaped = character */ > break; > diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c > index 9b51f95..6b1f1d7 100644 > --- a/servers/slapd/controls.c > +++ b/servers/slapd/controls.c > @@ -1005,7 +1005,7 @@ slap_remove_control( > op->o_tmpfree( op->o_ctrls[ j ], op->o_tmpmemctx ); >=20 > if ( i > 1 ) { > - AC_MEMCPY( &op->o_ctrls[ j ], &op->o_ctrls[ j + = 1 ], > + memmove( &op->o_ctrls[ j ], &op->o_ctrls[ j + 1 = ], > ( i - j ) * sizeof( LDAPControl * ) ); >=20 > } else { > diff --git a/servers/slapd/overlays/constraint.c = b/servers/slapd/overlays/constraint.c > index 096f32a..99844a5 100644 > --- a/servers/slapd/overlays/constraint.c > +++ b/servers/slapd/overlays/constraint.c > @@ -401,7 +401,7 @@ constraint_cf_gen( ConfigArgs *c ) > rc =3D ARG_BAD_CONF; > goto done; > } > - AC_MEMCPY( = &ap.lud->lud_filter[0], &ap.lud->lud_filter[1], len - 2 ); > + memmove( &ap.lud->lud_filter[0], = &ap.lud->lud_filter[1], len - 2 ); > ap.lud->lud_filter[len - 2] =3D = '\0'; > } >=20 > diff --git a/servers/slapd/overlays/memberof.c = b/servers/slapd/overlays/memberof.c > index 17cbae7..dcfb047 100644 > --- a/servers/slapd/overlays/memberof.c > +++ b/servers/slapd/overlays/memberof.c > @@ -616,10 +616,10 @@ memberof_op_add( Operation *op, SlapReply *rs ) > break; > } > =09 > - AC_MEMCPY( &a->a_vals[ i ], = &a->a_vals[ i + 1 ], > + memmove( &a->a_vals[ i ], = &a->a_vals[ i + 1 ], > sizeof( struct berval ) = * ( j - i ) ); > if ( a->a_nvals !=3D a->a_vals ) = { > - AC_MEMCPY( &a->a_nvals[ = i ], &a->a_nvals[ i + 1 ], > + memmove( &a->a_nvals[ i = ], &a->a_nvals[ i + 1 ], > sizeof( struct = berval ) * ( j - i ) ); > } > i--; > @@ -698,10 +698,10 @@ memberof_op_add( Operation *op, SlapReply *rs ) > break; > } > =09 > - AC_MEMCPY( &a->a_vals[ i ], = &a->a_vals[ i + 1 ], > + memmove( &a->a_vals[ i ], = &a->a_vals[ i + 1 ], > sizeof( struct berval ) = * ( j - i ) ); > if ( a->a_nvals !=3D a->a_vals ) = { > - AC_MEMCPY( &a->a_nvals[ = i ], &a->a_nvals[ i + 1 ], > + memmove( &a->a_nvals[ i = ], &a->a_nvals[ i + 1 ], > sizeof( struct = berval ) * ( j - i ) ); > } > i--; > @@ -922,9 +922,9 @@ memberof_op_modify( Operation *op, SlapReply *rs ) > break; > } > =09 > - AC_MEMCPY( = &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], > + memmove( = &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], > sizeof( = struct berval ) * ( j - i ) ); > - AC_MEMCPY( = &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], > + memmove( = &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], > sizeof( = struct berval ) * ( j - i ) ); > i--; > } > @@ -1022,10 +1022,10 @@ memberof_op_modify( Operation *op, SlapReply = *rs ) > break; > } > =09 > - AC_MEMCPY( = &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], > + memmove( = &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], > sizeof( = struct berval ) * ( j - i ) ); > if ( = ml->sml_nvalues !=3D ml->sml_values ) { > - = AC_MEMCPY( &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], > + memmove( = &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], > = sizeof( struct berval ) * ( j - i ) ); > } > i--; > @@ -1140,10 +1140,10 @@ memberof_op_modify( Operation *op, SlapReply = *rs ) > break; > } > =09 > - AC_MEMCPY( = &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], > + memmove( = &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], > sizeof( struct = berval ) * ( j - i ) ); > if ( ml->sml_nvalues !=3D = ml->sml_values ) { > - AC_MEMCPY( = &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], > + memmove( = &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], > sizeof( = struct berval ) * ( j - i ) ); > } > i--; > diff --git a/servers/slapd/overlays/rwm.c = b/servers/slapd/overlays/rwm.c > index 1fbfac3..22a536a 100644 > --- a/servers/slapd/overlays/rwm.c > +++ b/servers/slapd/overlays/rwm.c > @@ -2014,7 +2014,7 @@ rwm_bva_add( > int len =3D strlen( argv[ 0 ] ); >=20 > ber_str2bv( line, 0, 0, &bv ); > - AC_MEMCPY( &bv.bv_val[ len ], &bv.bv_val[ len + 1 ], > + memmove( &bv.bv_val[ len ], &bv.bv_val[ len + 1 ], > bv.bv_len - ( len + 1 ) ); > bv.bv_val[ bv.bv_len - 1 ] =3D '"'; >=20 > diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c > index b47a528..7436614 100644 > --- a/servers/slapd/sasl.c > +++ b/servers/slapd/sasl.c > @@ -1342,7 +1342,7 @@ slap_sasl_peer2ipport( struct berval *peer ) > *p =3D ';'; > if ( isv6 ) { > assert( p[-1] =3D=3D ']' ); > - AC_MEMCPY( &p[-1], p, plen - ( p - ipport ) + 1 = ); > + memmove( &p[-1], p, plen - ( p - ipport ) + 1 ); > } >=20 > } else if ( isv6 ) { > diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c > index 5e0ebbe..5449603 100644 > --- a/servers/slapd/saslauthz.c > +++ b/servers/slapd/saslauthz.c > @@ -182,14 +182,14 @@ int slap_parse_user( struct berval *id, struct = berval *user, > if ( !BER_BVISNULL( mech ) ) { > assert( mech->bv_val =3D=3D id->bv_val + 2 ); >=20 > - AC_MEMCPY( mech->bv_val - 2, mech->bv_val, mech->bv_len = + 1 ); > + memmove( mech->bv_val - 2, mech->bv_val, mech->bv_len + = 1 ); > mech->bv_val -=3D 2; > } >=20 > if ( !BER_BVISNULL( realm ) ) { > assert( realm->bv_val >=3D id->bv_val + 2 ); >=20 > - AC_MEMCPY( realm->bv_val - 2, realm->bv_val, = realm->bv_len + 1 ); > + memmove( realm->bv_val - 2, realm->bv_val, realm->bv_len = + 1 ); > realm->bv_val -=3D 2; > } >=20 >=20 > --------------090408030902080204080503-- >=20 >=20 >=20

1 0

Re: (ITS#8015) memcpy() overlapping in many places
by leo＠yuriev.ru 03 Jan '15

03 Jan '15

This is a multi-part message in MIME format. --------------090408030902080204080503 Content-Type: text/plain; charset=windows-1251; format=flowed Content-Transfer-Encoding: 7bit Please review and merge. Leonid. --------------090408030902080204080503 Content-Type: text/x-patch; name="its8015.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="its8015.patch" commit 8d55a7c88c6655879ffc677e5a9873f29bb7a802 Author: Leo Yuriev <leo(a)yuriev.ru> Date: 2015-01-01 16:00:58 +0300 ITS#8015 replace memcpy() by memmove() for overlapped src & dst. http://lwn.net/Articles/414467/ Initially a few cases have been detected using Valgrind. After that I manually reviewed all calls memcpy() and AC_MEMCPY() it the 2.4 branch. Unfortunately, we can not expect that all of these mistakes corrected, but it is much more than nothing. diff --git a/libraries/liblber/encode.c b/libraries/liblber/encode.c index e39fa07..3eb15c6 100644 --- a/libraries/liblber/encode.c +++ b/libraries/liblber/encode.c @@ -398,7 +398,7 @@ ber_start_seqorset( return -1; } dest = *p; - AC_MEMCPY( dest, headptr, headlen ); + memmove( dest, headptr, headlen ); ber->ber_sos_ptr = dest + headlen; ber->ber_sos_inner = dest + taglen - ber->ber_buf; @@ -467,7 +467,7 @@ ber_put_seqorset( BerElement *ber ) if ( unused != 0 ) { /* length(length) < the reserved SOS_LENLEN bytes */ xlen -= unused; - AC_MEMCPY( lenptr, p, xlen ); + memmove( lenptr, p, xlen ); ber->ber_sos_ptr = (char *) lenptr + xlen; } } diff --git a/libraries/libldap/sasl.c b/libraries/libldap/sasl.c index 8878d1f..4ad605f 100644 --- a/libraries/libldap/sasl.c +++ b/libraries/libldap/sasl.c @@ -628,7 +628,7 @@ sb_sasl_generic_drop_packet ( len = p->sec_buf_in.buf_ptr - p->sec_buf_in.buf_end; if ( len > 0 ) - AC_MEMCPY( p->sec_buf_in.buf_base, p->sec_buf_in.buf_base + + memmove( p->sec_buf_in.buf_base, p->sec_buf_in.buf_base + p->sec_buf_in.buf_end, len ); if ( len >= 4 ) { diff --git a/libraries/liblutil/utils.c b/libraries/liblutil/utils.c index 310380b..a783167 100644 --- a/libraries/liblutil/utils.c +++ b/libraries/liblutil/utils.c @@ -841,7 +841,7 @@ lutil_str2bin( struct berval *in, struct berval *out, void *ctx ) num.buf[num.beg] = neg; } if ( num.beg ) - AC_MEMCPY( num.buf, num.buf+num.beg, num.len ); + memmove( num.buf, num.buf+num.beg, num.len ); out->bv_len = num.len; decfail: if ( tmp != tmpbuf ) { diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c index f5c244c..f935efc 100644 --- a/servers/slapd/aclparse.c +++ b/servers/slapd/aclparse.c @@ -2317,7 +2317,7 @@ acl_regex_normalized_dn( for ( q = &p[2]; q[0] == ' '; q++ ) { /* DO NOTHING */ ; } - AC_MEMCPY( p+1, q, len-(q-str)+1); + memmove( p+1, q, len-(q-str)+1); } } pattern->bv_val = str; diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c index 6f6cb2f..2357452 100644 --- a/servers/slapd/ad.c +++ b/servers/slapd/ad.c @@ -277,7 +277,7 @@ int slap_bv2ad( } else if ( rc > 0 || ( rc == 0 && (unsigned)optlen > tags[i].bv_len )) { - AC_MEMCPY( &tags[i+2], &tags[i+1], + memmove( &tags[i+2], &tags[i+1], (ntags-i-1)*sizeof(struct berval) ); tags[i+1].bv_val = opt; tags[i+1].bv_len = optlen; @@ -286,7 +286,7 @@ int slap_bv2ad( } if( ntags ) { - AC_MEMCPY( &tags[1], &tags[0], + memmove( &tags[1], &tags[0], ntags*sizeof(struct berval) ); } tags[0].bv_val = opt; diff --git a/servers/slapd/back-bdb/attr.c b/servers/slapd/back-bdb/attr.c index 2f183b3..e4ab16f 100644 --- a/servers/slapd/back-bdb/attr.c +++ b/servers/slapd/back-bdb/attr.c @@ -71,7 +71,7 @@ ainfo_insert( struct bdb_info *bdb, AttrInfo *a ) bdb->bi_attrs = ch_realloc( bdb->bi_attrs, ( bdb->bi_nattrs+1 ) * sizeof( AttrInfo * )); if ( x < bdb->bi_nattrs ) - AC_MEMCPY( &bdb->bi_attrs[x+1], &bdb->bi_attrs[x], + memmove( &bdb->bi_attrs[x+1], &bdb->bi_attrs[x], ( bdb->bi_nattrs - x ) * sizeof( AttrInfo *)); bdb->bi_attrs[x] = a; bdb->bi_nattrs++; diff --git a/servers/slapd/back-bdb/idl.c b/servers/slapd/back-bdb/idl.c index c6bc9f3..f024245 100644 --- a/servers/slapd/back-bdb/idl.c +++ b/servers/slapd/back-bdb/idl.c @@ -204,7 +204,7 @@ int bdb_idl_insert( ID *ids, ID id ) } else { /* insert id */ - AC_MEMCPY( &ids[x+1], &ids[x], (ids[0]-x) * sizeof(ID) ); + memmove( &ids[x+1], &ids[x], (ids[0]-x) * sizeof(ID) ); ids[x] = id; } @@ -262,7 +262,7 @@ int bdb_idl_delete( ID *ids, ID id ) } } else { - AC_MEMCPY( &ids[x], &ids[x+1], (1+ids[0]-x) * sizeof(ID) ); + memmove( &ids[x], &ids[x+1], (1+ids[0]-x) * sizeof(ID) ); } #if IDL_DEBUG > 1 diff --git a/servers/slapd/back-ldap/config.c b/servers/slapd/back-ldap/config.c index 11a4ac4..4b5c394 100644 --- a/servers/slapd/back-ldap/config.c +++ b/servers/slapd/back-ldap/config.c @@ -1047,7 +1047,7 @@ ldap_back_cf_gen( ConfigArgs *c ) if ( i ) { bv.bv_len -= i; - AC_MEMCPY( bv.bv_val, &bv.bv_val[ i ], + memmove( bv.bv_val, &bv.bv_val[ i ], bv.bv_len + 1 ); } @@ -1239,7 +1239,7 @@ ldap_back_cf_gen( ConfigArgs *c ) if ( i ) { bc.bv_len -= i; - AC_MEMCPY( bc.bv_val, &bc.bv_val[ i ], bc.bv_len + 1 ); + memmove( bc.bv_val, &bc.bv_val[ i ], bc.bv_len + 1 ); } bv = bc; @@ -1298,7 +1298,7 @@ ldap_back_cf_gen( ConfigArgs *c ) if ( i ) { bv.bv_len -= i; - AC_MEMCPY( bv.bv_val, &bv.bv_val[ i ], + memmove( bv.bv_val, &bv.bv_val[ i ], bv.bv_len + 1 ); } diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c index eeab466..b100510 100644 --- a/servers/slapd/back-ldap/search.c +++ b/servers/slapd/back-ldap/search.c @@ -109,7 +109,7 @@ ldap_back_munge_filter( ptr = filter->bv_val + ( ptr - oldfilter.bv_val ); - AC_MEMCPY( &ptr[ newbv->bv_len ], + memmove( &ptr[ newbv->bv_len ], &ptr[ oldbv->bv_len ], oldfilter.bv_len - ( ptr - filter->bv_val ) - oldbv->bv_len + 1 ); AC_MEMCPY( ptr, newbv->bv_val, newbv->bv_len ); diff --git a/servers/slapd/back-mdb/attr.c b/servers/slapd/back-mdb/attr.c index 5da9da9..38e513e 100644 --- a/servers/slapd/back-mdb/attr.c +++ b/servers/slapd/back-mdb/attr.c @@ -71,7 +71,7 @@ ainfo_insert( struct mdb_info *mdb, AttrInfo *a ) mdb->mi_attrs = ch_realloc( mdb->mi_attrs, ( mdb->mi_nattrs+1 ) * sizeof( AttrInfo * )); if ( x < mdb->mi_nattrs ) - AC_MEMCPY( &mdb->mi_attrs[x+1], &mdb->mi_attrs[x], + memmove( &mdb->mi_attrs[x+1], &mdb->mi_attrs[x], ( mdb->mi_nattrs - x ) * sizeof( AttrInfo *)); mdb->mi_attrs[x] = a; mdb->mi_nattrs++; diff --git a/servers/slapd/back-mdb/idl.c b/servers/slapd/back-mdb/idl.c index 3c2f986..c03f7c3 100644 --- a/servers/slapd/back-mdb/idl.c +++ b/servers/slapd/back-mdb/idl.c @@ -173,7 +173,7 @@ int mdb_idl_insert( ID *ids, ID id ) } else { /* insert id */ - AC_MEMCPY( &ids[x+1], &ids[x], (ids[0]-x) * sizeof(ID) ); + memmove( &ids[x+1], &ids[x], (ids[0]-x) * sizeof(ID) ); ids[x] = id; } @@ -231,7 +231,7 @@ static int mdb_idl_delete( ID *ids, ID id ) } } else { - AC_MEMCPY( &ids[x], &ids[x+1], (1+ids[0]-x) * sizeof(ID) ); + memmove( &ids[x], &ids[x+1], (1+ids[0]-x) * sizeof(ID) ); } #if IDL_DEBUG > 1 diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c index e3164b0..daa5e8b 100644 --- a/servers/slapd/back-meta/config.c +++ b/servers/slapd/back-meta/config.c @@ -1340,7 +1340,7 @@ meta_back_cf_gen( ConfigArgs *c ) if ( i ) { bv.bv_len -= i; - AC_MEMCPY( bv.bv_val, &bv.bv_val[ i ], + memmove( bv.bv_val, &bv.bv_val[ i ], bv.bv_len + 1 ); } @@ -1597,7 +1597,7 @@ meta_back_cf_gen( ConfigArgs *c ) if ( i ) { bc.bv_len -= i; - AC_MEMCPY( bc.bv_val, &bc.bv_val[ i ], bc.bv_len + 1 ); + memmove( bc.bv_val, &bc.bv_val[ i ], bc.bv_len + 1 ); } bv = bc; @@ -2720,7 +2720,7 @@ idassert-authzFrom "dn:<rootdn>" int len = strlen( argv[ 0 ] ); ber_str2bv( line, 0, 0, &bv ); - AC_MEMCPY( &bv.bv_val[ len ], &bv.bv_val[ len + 1 ], + memmove( &bv.bv_val[ len ], &bv.bv_val[ len + 1 ], bv.bv_len - ( len + 1 )); bv.bv_val[ bv.bv_len - 1] = '"'; ber_bvarray_add( &mt->mt_rwmap.rwm_bva_rewrite, &bv ); diff --git a/servers/slapd/back-sql/util.c b/servers/slapd/back-sql/util.c index 3564527..7c77964 100644 --- a/servers/slapd/back-sql/util.c +++ b/servers/slapd/back-sql/util.c @@ -411,7 +411,7 @@ backsql_split_pattern( } else if ( real_end[ 1 ] == SPLIT_CHAR ) { expected++; - AC_MEMCPY( real_end, real_end + 1, strlen( real_end ) ); + memmove( real_end, real_end + 1, strlen( real_end ) ); end = strchr( real_end + 1, SPLIT_CHAR ); continue; } diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c index 2214334..9655629 100644 --- a/servers/slapd/bconfig.c +++ b/servers/slapd/bconfig.c @@ -2353,7 +2353,7 @@ sortval_reject: s = ber_bvchr( &bv, '"' ); assert( s != NULL ); /* move the trailing quote of argv[0] to the end */ - AC_MEMCPY( s, s + 1, bv.bv_len - ( s - bv.bv_val ) ); + memmove( s, s + 1, bv.bv_len - ( s - bv.bv_val ) ); bv.bv_val[ bv.bv_len - 1 ] = '"'; } else { diff --git a/servers/slapd/config.c b/servers/slapd/config.c index cdc17d9..5c0dd55 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -2159,12 +2159,12 @@ strtok_quote( char *line, char *sep, char **quote_ptr ) } else { inquote = 1; } - AC_MEMCPY( next, next + 1, strlen( next + 1 ) + 1 ); + memmove( next, next + 1, strlen( next + 1 ) + 1 ); break; case '\\': if ( next[1] ) - AC_MEMCPY( next, + memmove( next, next + 1, strlen( next + 1 ) + 1 ); next++; /* dont parse the escaped character */ break; diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c index 9b51f95..6b1f1d7 100644 --- a/servers/slapd/controls.c +++ b/servers/slapd/controls.c @@ -1005,7 +1005,7 @@ slap_remove_control( op->o_tmpfree( op->o_ctrls[ j ], op->o_tmpmemctx ); if ( i > 1 ) { - AC_MEMCPY( &op->o_ctrls[ j ], &op->o_ctrls[ j + 1 ], + memmove( &op->o_ctrls[ j ], &op->o_ctrls[ j + 1 ], ( i - j ) * sizeof( LDAPControl * ) ); } else { diff --git a/servers/slapd/overlays/constraint.c b/servers/slapd/overlays/constraint.c index 096f32a..99844a5 100644 --- a/servers/slapd/overlays/constraint.c +++ b/servers/slapd/overlays/constraint.c @@ -401,7 +401,7 @@ constraint_cf_gen( ConfigArgs *c ) rc = ARG_BAD_CONF; goto done; } - AC_MEMCPY( &ap.lud->lud_filter[0], &ap.lud->lud_filter[1], len - 2 ); + memmove( &ap.lud->lud_filter[0], &ap.lud->lud_filter[1], len - 2 ); ap.lud->lud_filter[len - 2] = '\0'; } diff --git a/servers/slapd/overlays/memberof.c b/servers/slapd/overlays/memberof.c index 17cbae7..dcfb047 100644 --- a/servers/slapd/overlays/memberof.c +++ b/servers/slapd/overlays/memberof.c @@ -616,10 +616,10 @@ memberof_op_add( Operation *op, SlapReply *rs ) break; } - AC_MEMCPY( &a->a_vals[ i ], &a->a_vals[ i + 1 ], + memmove( &a->a_vals[ i ], &a->a_vals[ i + 1 ], sizeof( struct berval ) * ( j - i ) ); if ( a->a_nvals != a->a_vals ) { - AC_MEMCPY( &a->a_nvals[ i ], &a->a_nvals[ i + 1 ], + memmove( &a->a_nvals[ i ], &a->a_nvals[ i + 1 ], sizeof( struct berval ) * ( j - i ) ); } i--; @@ -698,10 +698,10 @@ memberof_op_add( Operation *op, SlapReply *rs ) break; } - AC_MEMCPY( &a->a_vals[ i ], &a->a_vals[ i + 1 ], + memmove( &a->a_vals[ i ], &a->a_vals[ i + 1 ], sizeof( struct berval ) * ( j - i ) ); if ( a->a_nvals != a->a_vals ) { - AC_MEMCPY( &a->a_nvals[ i ], &a->a_nvals[ i + 1 ], + memmove( &a->a_nvals[ i ], &a->a_nvals[ i + 1 ], sizeof( struct berval ) * ( j - i ) ); } i--; @@ -922,9 +922,9 @@ memberof_op_modify( Operation *op, SlapReply *rs ) break; } - AC_MEMCPY( &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], + memmove( &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], sizeof( struct berval ) * ( j - i ) ); - AC_MEMCPY( &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], + memmove( &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], sizeof( struct berval ) * ( j - i ) ); i--; } @@ -1022,10 +1022,10 @@ memberof_op_modify( Operation *op, SlapReply *rs ) break; } - AC_MEMCPY( &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], + memmove( &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], sizeof( struct berval ) * ( j - i ) ); if ( ml->sml_nvalues != ml->sml_values ) { - AC_MEMCPY( &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], + memmove( &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], sizeof( struct berval ) * ( j - i ) ); } i--; @@ -1140,10 +1140,10 @@ memberof_op_modify( Operation *op, SlapReply *rs ) break; } - AC_MEMCPY( &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], + memmove( &ml->sml_values[ i ], &ml->sml_values[ i + 1 ], sizeof( struct berval ) * ( j - i ) ); if ( ml->sml_nvalues != ml->sml_values ) { - AC_MEMCPY( &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], + memmove( &ml->sml_nvalues[ i ], &ml->sml_nvalues[ i + 1 ], sizeof( struct berval ) * ( j - i ) ); } i--; diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c index 1fbfac3..22a536a 100644 --- a/servers/slapd/overlays/rwm.c +++ b/servers/slapd/overlays/rwm.c @@ -2014,7 +2014,7 @@ rwm_bva_add( int len = strlen( argv[ 0 ] ); ber_str2bv( line, 0, 0, &bv ); - AC_MEMCPY( &bv.bv_val[ len ], &bv.bv_val[ len + 1 ], + memmove( &bv.bv_val[ len ], &bv.bv_val[ len + 1 ], bv.bv_len - ( len + 1 ) ); bv.bv_val[ bv.bv_len - 1 ] = '"'; diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c index b47a528..7436614 100644 --- a/servers/slapd/sasl.c +++ b/servers/slapd/sasl.c @@ -1342,7 +1342,7 @@ slap_sasl_peer2ipport( struct berval *peer ) *p = ';'; if ( isv6 ) { assert( p[-1] == ']' ); - AC_MEMCPY( &p[-1], p, plen - ( p - ipport ) + 1 ); + memmove( &p[-1], p, plen - ( p - ipport ) + 1 ); } } else if ( isv6 ) { diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c index 5e0ebbe..5449603 100644 --- a/servers/slapd/saslauthz.c +++ b/servers/slapd/saslauthz.c @@ -182,14 +182,14 @@ int slap_parse_user( struct berval *id, struct berval *user, if ( !BER_BVISNULL( mech ) ) { assert( mech->bv_val == id->bv_val + 2 ); - AC_MEMCPY( mech->bv_val - 2, mech->bv_val, mech->bv_len + 1 ); + memmove( mech->bv_val - 2, mech->bv_val, mech->bv_len + 1 ); mech->bv_val -= 2; } if ( !BER_BVISNULL( realm ) ) { assert( realm->bv_val >= id->bv_val + 2 ); - AC_MEMCPY( realm->bv_val - 2, realm->bv_val, realm->bv_len + 1 ); + memmove( realm->bv_val - 2, realm->bv_val, realm->bv_len + 1 ); realm->bv_val -= 2; } --------------090408030902080204080503--

1 0

(ITS#8015) memcpy() overlapping in many places
by leo＠yuriev.ru 03 Jan '15

03 Jan '15

Full_Name: Leonid Yuriev Version: 2.4-HEAD OS: RHEL7 URL: ftp://ftp.openldap.org/incoming/ Submission from: (NULL) (31.130.36.33) A lot of places where memcpy() is called with overlapping source and destination, or such is possible in some cases. Explanation of why this is a problem, see. Http://lwn.net/Articles/414467/ Patch will be available shortly. Leonid.

1 0

Re: (ITS#8014) minor memleak in slapadd
by leo＠yuriev.ru 03 Jan '15

03 Jan '15

This is a multi-part message in MIME format. --------------020803010305090509060904 Content-Type: text/plain; charset=windows-1251; format=flowed Content-Transfer-Encoding: 7bit Please review attached patch and merge. Leonid. --- The attached files is derived from OpenLDAP Software. All of the modifications to OpenLDAP Software represented in the following patch(es) were developed by Peter-Service LLC, Moscow, Russia. Peter-Service LLC has not assigned rights and/or interest in this work to any party. I, Leonid Yuriev am authorized by Peter-Service LLC, my employer, to release this work under the following terms. Peter-Service LLC hereby places the following modifications to OpenLDAP Software (and only these modifications) into the public domain. Hence, these modifications may be freely used and/or redistributed for any purpose with or without attribution and/or other notice. --------------020803010305090509060904 Content-Type: text/x-patch; name="its8014.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="its8014.patch" commit 39ffdbe0abda49189d52432a4c950589a288a9c0 Author: Leo Yuriev <leo(a)yuriev.ru> Date: 2015-01-01 23:52:14 +0300 ITS#8014: minor CSN memleak in slapadd. diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c index 01a4955..73c6579 100644 --- a/servers/slapd/slapcommon.c +++ b/servers/slapd/slapcommon.c @@ -975,7 +975,7 @@ slap_tool_update_ctxcsn( { struct berval ctxdn; ID ctxcsn_id; - Entry *ctxcsn_e; + Entry *ctxcsn_e = NULL; int rc = EXIT_SUCCESS; if ( !(update_ctxcsn && !dryrun && sid != SLAP_SYNC_SID_MAX + 1) ) { @@ -1093,6 +1093,11 @@ slap_tool_update_ctxcsn( } } + if (ctxcsn_e) { + Operation op = {0}; + op.o_bd = be; + be_entry_release_w(&op, ctxcsn_e); + } return rc; } --------------020803010305090509060904--

1 0

(ITS#8014) minor memleak in slapadd
by leo＠yuriev.ru 03 Jan '15

03 Jan '15

Full_Name: Leonid Yuriev Version: 2.4-HEAD OS: RHEL7 URL: ftp://ftp.openldap.org/incoming/ Submission from: (NULL) (31.130.36.33) Minor memleak was found by valgrind tool. Patch will be available shortly. Leonid.

1 0

Re: (ITS#8013) SIGSEGV in test_filter()
by leo＠yuriev.ru 03 Jan '15

03 Jan '15

This is a multi-part message in MIME format. --------------070304060303090304060107 Content-Type: text/plain; charset=windows-1251; format=flowed Content-Transfer-Encoding: 7bit Please review attached patch and merge. Leonid. --- The attached files is derived from OpenLDAP Software. All of the modifications to OpenLDAP Software represented in the following patch(es) were developed by Peter-Service LLC, Moscow, Russia. Peter-Service LLC has not assigned rights and/or interest in this work to any party. I, Leonid Yuriev am authorized by Peter-Service LLC, my employer, to release this work under the following terms. Peter-Service LLC hereby places the following modifications to OpenLDAP Software (and only these modifications) into the public domain. Hence, these modifications may be freely used and/or redistributed for any purpose with or without attribution and/or other notice. --------------070304060303090304060107 Content-Type: text/x-patch; name="its8013.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="its8013.patch" commit 51051e4142a43e37bc622775e4f816d38d2e269c Author: Leo Yuriev <leo(a)yuriev.ru> Date: 2015-01-01 16:44:50 +0300 ITS#8013 fix rare SIGSEGV in test_filter(). Clear PS_FIX_FILTER while alter the filter in syncprov_matchops(). diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c index 2eeda4c..53432b0 100644 --- a/servers/slapd/overlays/syncprov.c +++ b/servers/slapd/overlays/syncprov.c @@ -1308,7 +1308,9 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit ) /* Skip the AND/GE clause that we stuck on in front. We would lose deletes/mods that happen during the refresh phase otherwise (ITS#6555) */ - op2.ors_filter = ss->s_op->ors_filter->f_and->f_next; + assert(ss->s_op->ors_filter->f_choice == LDAP_FILTER_AND); + op2.ors_filter = op2.ors_filter->f_and->f_next; + ss->s_flags ^= PS_FIX_FILTER; } ldap_pvt_thread_mutex_unlock( &ss->s_mutex ); rc = test_filter( &op2, e, op2.ors_filter ); @@ -2241,6 +2243,7 @@ syncprov_detach_op( Operation *op, syncops *so, slap_overinst *on ) /* Skip the AND/GE clause that we stuck on in front */ if ( so->s_flags & PS_FIX_FILTER ) { + assert(op2->ors_filter->f_choice == LDAP_FILTER_AND); op2->ors_filter = op->ors_filter->f_and->f_next; so->s_flags ^= PS_FIX_FILTER; } else { @@ -2394,7 +2397,6 @@ syncprov_search_response( Operation *op, SlapReply *rs ) ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); /* syncprov_ab_cleanup will free this syncop */ return SLAPD_ABANDON; - } else { ldap_pvt_thread_mutex_lock( &ss->ss_so->s_mutex ); /* Turn off the refreshing flag */ --------------070304060303090304060107--

1 0

(ITS#8013) SIGSEGV in test_filter()
by leo＠yuriev.ru 03 Jan '15

03 Jan '15

Full_Name: Leonid Yuriev Version: 2.4-HEAD OS: RHEL7 URL: ftp://ftp.openldap.org/incoming/ Submission from: (NULL) (31.130.36.33) I have previously reported on the two SIGSEGV backtraces (see a copy below). This bug was reproduced again during our replication test. I think that now I have found the reason - the PS_FIX_FILTER flag not cleared after update the filter. Patch will be available shortly. Please review and merge. Leonid. === *** Signal 11 (Segmentation fault), address is 0xb from 0x442f07 (0) /opt/openldap.devel/libexec/slapd() [0x442f07]: test_filter /home/ly/Projects/openldap.git/servers/slapd/filterentry.c:69 (1) /opt/openldap.devel/libexec/slapd() [0x514721]: syncprov_matchops /home/ly/Projects/openldap.git/servers/slapd/overlays/syncprov.c:1316 (2) /opt/openldap.devel/libexec/slapd() [0x514b83]: syncprov_op_mod /home/ly/Projects/openldap.git/servers/slapd/overlays/syncprov.c:2145 (3) /opt/openldap.devel/libexec/slapd() [0x48b31a]: overlay_op_walk /home/ly/Projects/openldap.git/servers/slapd/backover.c:662 (4) /opt/openldap.devel/libexec/slapd() [0x48b4c1]: over_op_func /home/ly/Projects/openldap.git/servers/slapd/backover.c:724 (5) /opt/openldap.devel/libexec/slapd() [0x4811a6]: syncrepl_entry /home/ly/Projects/openldap.git/servers/slapd/syncrepl.c:3177 do_syncrep2 /home/ly/Projects/openldap.git/servers/slapd/syncrepl.c:10%0 (6) /opt/openldap.devel/libexec/slapd() [0x4844b2]: do_syncrepl /home/ly/Projects/openldap.git/servers/slapd/syncrepl.c:1539 === Program received signal SIGSEGV, Segmentation fault. [Switching to Thread 0x7f9762ffe700 (LWP 29507)]D%D test_filter (op=0x7f9762ffc210, e=0x7f96f19c37d8, f=0x20) at filterentry.c:69 69 if ( f->f_choice & SLAPD_FILTER_UNDEFINED ) { (0) /opt/openldap.devel/libexec/slapd() [0x4430b7]: test_filter /home/ly/Projects/openldap.git/servers/slapd/filterentry.c:69 (1) /opt/openldap.devel/libexec/slapd() [0x515081]: syncprov_matchops /home/ly/Projects/openldap.git/servers/slapd/overlays/syncprov.c:1317 (2) /opt/openldap.devel/libexec/slapd() [0x515f43]: syncprov_op_response /home/ly/Projects/openldap.git/servers/slapd/overlays/syncprov.c:1941 (3) /opt/openldap.devel/libexec/slapd() [0x434163]: slap_response_play /home/ly/Projects/openldap.git/servers/slapd/result.c:509 (4) /opt/openldap.devel/libexec/slapd() [0x4346ca]: send_ldap_response /home/ly/Projects/openldap.git/servers/slapd/result.c:584 (5) /opt/openldap.devel/libexec/slapd() [0x435062]: slap_send_ldap_result /home/ly/Projects/openldap.git/servers/slapd/result.c:861 (6) /opt/openldap.devel/libexec/slapd() [0x4cb2e9]: mdb_add /home/ly/Projects/openldap.git/servers/slapd/back-mdb/add.c:434 (7) /opt/openldap.devel/libexec/slapd() [0x48b506]: overlay_op_walk /home/ly/Projects/openldap.git/servers/slapd/backover.c:674 (8) /opt/openldap.devel/libexec/slapd() [0x48b671]: over_op_func /home/ly%Projojects/openldap.git/servers/slapd/backover.c:724

1 0

Re: (ITS#8012) SIGSEGV while disconnect/abandon
by leo＠yuriev.ru 29 Dec '14

29 Dec '14

This is a multi-part message in MIME format. --------------090802040703090609040601 Content-Type: text/plain; charset=windows-1251; format=flowed Content-Transfer-Encoding: 8bit Patch update: Detaching a syncops record from op-list CONDITIONALLY, only when it was freed by syncprov_free_syncop. The syncprov_drop_psearch() and syncprov_drop_psearch() now returns a flag, which is nonzero if the given syncops was freed. Leonid. 29.12.2014 13:50, Leonid Yuriev ïèøåò: > Please review attached patch and merge-in. > > Leonid. > > --- > > The attached files is derived from OpenLDAP Software. All of the > modifications > to OpenLDAP Software represented in the following patch(es) were > developed by > Peter-Service LLC, Moscow, Russia. Peter-Service LLC has not assigned > rights > and/or interest in this work to any party. I, Leonid Yuriev am > authorized by > Peter-Service LLC, my employer, to release this work under the > following terms. > > Peter-Service LLC hereby places the following modifications to > OpenLDAP Software > (and only these modifications) into the public domain. Hence, these > modifications may be freely used and/or redistributed for any purpose > with or without attribution and/or other notice. > --------------090802040703090609040601 Content-Type: text/x-patch; name="its8012.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="its8012.patch" commit 34d36d685ccb372dfd43a33730b480610ab369a0 Author: Leo Yuriev <leo(a)yuriev.ru> Date: 2014-12-29 13:40:59 +0300 ITS#5452, ITS#8012: fix syncops list iteration and detaching on freed; Detaching a syncops record from op-list conditionally, only when it was freed by syncprov_free_syncop. The syncprov_drop_psearch() and syncprov_drop_psearch() now returns a flag, which is nonzero if the given syncops was freed. diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c index 5ef2eaa..2eeda4c 100644 --- a/servers/slapd/overlays/syncprov.c +++ b/servers/slapd/overlays/syncprov.c @@ -790,7 +790,7 @@ static int dec_mutexint( mutexint *mi ) return i; } -static void +static int syncprov_free_syncop( syncops *so ) { syncres *sr, *srnext; @@ -800,7 +800,7 @@ syncprov_free_syncop( syncops *so ) /* already being freed, or still in use */ if ( !so->s_inuse || --so->s_inuse > 0 ) { ldap_pvt_thread_mutex_unlock( &so->s_mutex ); - return; + return 0; } ldap_pvt_thread_mutex_unlock( &so->s_mutex ); if ( so->s_flags & PS_IS_DETACHED ) { @@ -824,6 +824,7 @@ syncprov_free_syncop( syncops *so ) } ldap_pvt_thread_mutex_destroy( &so->s_mutex ); ch_free( so ); + return 1; } /* Send a persistent search response */ @@ -1104,9 +1105,7 @@ syncprov_drop_psearch( syncops *so, int lock ) if ( lock ) ldap_pvt_thread_mutex_unlock( &so->s_op->o_conn->c_mutex ); } - syncprov_free_syncop( so ); - - return 0; + return syncprov_free_syncop( so ); } static int @@ -1166,10 +1165,10 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit ) syncprov_info_t *si = on->on_bi.bi_private; fbase_cookie fc; - syncops *ss, *sprev, *snext; + syncops **pss; Entry *e = NULL; Attribute *a; - int rc; + int rc, gonext; struct berval newdn; int freefdn = 0; BackendDB *b0 = op->o_bd, db; @@ -1229,15 +1228,15 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit ) } ldap_pvt_thread_mutex_lock( &si->si_ops_mutex ); - for (ss = si->si_ops, sprev = (syncops *)&si->si_ops; ss; - sprev = ss, ss=snext) + for (pss = &si->si_ops; *pss; pss = gonext ? &(*pss)->s_next : pss) { Operation op2; Opheader oh; syncmatches *sm; int found = 0; + syncops *snext, *ss = *pss; - snext = ss->s_next; + gonext = 1; if ( ss->s_op->o_abandon ) continue; @@ -1266,9 +1265,10 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit ) SlapReply rs = {REP_RESULT}; send_ldap_error( ss->s_op, &rs, LDAP_SYNC_REFRESH_REQUIRED, "search base has changed" ); - sprev->s_next = snext; - syncprov_drop_psearch( ss, 1 ); - ss = sprev; + snext = ss->s_next; + if ( syncprov_drop_psearch( ss, 1 ) ) + *pss = snext; + gonext = 0; continue; } @@ -1342,7 +1342,11 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit ) /* Decrement s_inuse, was incremented when called * with saveit == TRUE */ - syncprov_free_syncop( ss ); + snext = ss->s_next; + if ( syncprov_free_syncop( ss ) ) { + *pss = snext; + gonext = 0; + } } } ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex ); --------------090802040703090609040601--

1 0

Re: (ITS#5452) seg fault in syncprov_op abandon on master
by leo＠yuriev.ru 29 Dec '14

29 Dec '14

ITS#8012 is a duplicate of this bug. Please see ones and review/apply the patch. http://www.openldap.org/its/index.cgi/Incoming?id=8012 Leonid.

1 0

Re: (ITS#8012) SIGSEGV while disconnect/abandon
by leo＠yuriev.ru 29 Dec '14

29 Dec '14

I think this is duplicate of ITS#5452. Happy New Year! Leonid.

1 0

Re: (ITS#8012) SIGSEGV while disconnect/abandon
by leo＠yuriev.ru 29 Dec '14

29 Dec '14

This is a multi-part message in MIME format. --------------010303050205060701030601 Content-Type: text/plain; charset=windows-1251; format=flowed Content-Transfer-Encoding: 7bit Please review attached patch and merge-in. Leonid. --- The attached files is derived from OpenLDAP Software. All of the modifications to OpenLDAP Software represented in the following patch(es) were developed by Peter-Service LLC, Moscow, Russia. Peter-Service LLC has not assigned rights and/or interest in this work to any party. I, Leonid Yuriev am authorized by Peter-Service LLC, my employer, to release this work under the following terms. Peter-Service LLC hereby places the following modifications to OpenLDAP Software (and only these modifications) into the public domain. Hence, these modifications may be freely used and/or redistributed for any purpose with or without attribution and/or other notice. --------------010303050205060701030601 Content-Type: text/x-patch; name="its8012.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="its8012.patch" commit decf38f5c4ca7bc90edc2def3e14ba146d786f5b Author: Leo Yuriev <leo(a)yuriev.ru> Date: 2014-12-29 13:40:59 +0300 ITS#8012: fix syncops list iteration; diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c index 5ef2eaa..eff9e1c 100644 --- a/servers/slapd/overlays/syncprov.c +++ b/servers/slapd/overlays/syncprov.c @@ -1166,10 +1166,10 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit ) syncprov_info_t *si = on->on_bi.bi_private; fbase_cookie fc; - syncops *ss, *sprev, *snext; + syncops **pss; Entry *e = NULL; Attribute *a; - int rc; + int rc, gonext; struct berval newdn; int freefdn = 0; BackendDB *b0 = op->o_bd, db; @@ -1229,15 +1229,15 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit ) } ldap_pvt_thread_mutex_lock( &si->si_ops_mutex ); - for (ss = si->si_ops, sprev = (syncops *)&si->si_ops; ss; - sprev = ss, ss=snext) + for (pss = &si->si_ops; *pss; pss = gonext ? &(*pss)->s_next : pss) { Operation op2; Opheader oh; syncmatches *sm; int found = 0; + syncops *ss = *pss; - snext = ss->s_next; + gonext = 1; if ( ss->s_op->o_abandon ) continue; @@ -1266,9 +1266,9 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit ) SlapReply rs = {REP_RESULT}; send_ldap_error( ss->s_op, &rs, LDAP_SYNC_REFRESH_REQUIRED, "search base has changed" ); - sprev->s_next = snext; + *pss = ss->s_next; + gonext = 0; syncprov_drop_psearch( ss, 1 ); - ss = sprev; continue; } @@ -1342,6 +1342,8 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit ) /* Decrement s_inuse, was incremented when called * with saveit == TRUE */ + *pss = ss->s_next; + gonext = 0; syncprov_free_syncop( ss ); } } --------------010303050205060701030601--

1 0

Re: (ITS#6104) race condition with cancel operation
by ddh3eaa＠gmail.com 29 Dec '14

29 Dec '14

Sent from my iPhone

1 0

Re: (ITS#8012) SIGSEGV while disconnect/abandon
by leo＠yuriev.ru 29 Dec '14

29 Dec '14

Let see to syncprov_matchops() in syncprov.c: lines 1233-1235 (begin of the loop): ldap_pvt_thread_mutex_lock( &si->si_ops_mutex ); for (ss = si->si_ops, sprev = (syncops *)&si->si_ops; ss; sprev = ss, ss=snext) lines 1273-1275: ss = sprev; continue; } and 1347 (near from end of the loop): syncprov_free_syncop( ss ); Seems that syncops which is freed on 1347 could be referenced by 1273 on a next iteration of the loop. Leonid.

1 0

Re: (ITS#8012) SIGSEGV while disconnect/abandon
by leo＠yuriev.ru 29 Dec '14

29 Dec '14

(gdb) info local on = <optimised out> si = 0x23b33f0 so = 0x7f14b444cd30 soprev = 0x7f14e02dc9b0 (gdb) p *so->s_op->o_hdr Cannot access memory at address 0x3932323134313032 (gdb) p *si $1 = {si_ops = 0x7f14e949ed60, si_contextdn = {bv_len = 7, bv_val = 0x2389e10 "dc=ldap"}, si_ctxcsn = 0x2640e60, si_sids = 0x243a6c0, si_numcsns = 4, si_chkops = 1, si_chktime = 60, si_numops = 0, si_nopres = 0, si_usehint = 1, si_active = 2, si_dirty = 0, si_chklast = 1419822205, si_mods = 0x7f14bcead650, si_logs = 0x0, si_csn_rwlock = {__data = {__lock = 0, __nr_readers = 0, __readers_wakeup = 5312, __writer_wakeup = 9078, __nr_readers_queued = 0, __nr_writers_queued = 0, __writer = 0, __shared = 0, __pad1 = 0, __pad2 = 0, __flags = 0}, __size = "\000\000\000\000\000\000\000\000\300\024\000\000v#", '\000' <repeats 41 times>, __align = 0}, si_ops_mutex = {__data = {__lock = 1, __count = 0, __owner = 30051, __nusers = 1, __kind = 0, __spins = 0, __elision = 0, __list = {__prev = 0x0, __next = 0x0}}, __size = "\001\000\000\000\000\000\000\000cu\000\000\001", '\000' <repeats 26 times>, __align = 1}, si_mods_mutex = {__data = { __lock = 0, __count = 0, __owner = 0, __nusers = 0, __kind = 0, __spins = 0, __elision = 0, __list = {__prev = 0x0, __next = 0x0}}, __size = '\000' <repeats 39 times>, __align = 0}, si_resp_mutex = {__data = {__lock = 0, __count = 0, __owner = 0, __nusers = 0, __kind = 0, __spins = 0, __elision = 0, __list = {__prev = 0x0, __next = 0x0}}, __size = '\000' <repeats 39 times>, __align = 0}} (gdb) p *so $2 = {s_next = 0x0, s_base = {bv_len = 15, bv_val = 0x7f14b4964180 "dc=ngdr,dc=ldap"}, s_eid = 4, s_op = 0x7f14b0a12d30, s_rid = 4, s_sid = 1, s_filterstr = {bv_len = 15, bv_val = 0x7f14b4000b18 "\300\f"}, s_flags = 17, s_inuse = 1, s_res = 0x7f14d19ff780, s_restail = 0x7f14c818b090, s_mutex = {__data = {__lock = 0, __count = 0, __owner = 0, __nusers = 0, __kind = 0, __spins = 0, __elision = 0, __list = {__prev = 0x0, __next = 0x0}}, __size = '\000' <repeats 39 times>, __align = 0}} (gdb) p *so->s_op $3 = {o_hdr = 0x3932323134313032, o_tag = 25385731496096560, o_time = 8029759185026510703, o_tincr = 37, o_bd = 0x3932323134313032, o_req_dn = {bv_len = 25385731496096560, bv_val = 0x20 <Address 0x20 out of bounds>}, o_req_ndn = {bv_len = 37, bv_val = 0x7061646c3d6364 <Address 0x7061646c3d6364 out of bounds>}, o_request = {oq_add = {rs_modlist = 0x6f6f6f6f6f6f6f6f, rs_e = 0x6f6f6f6f6f6f6f6f}, oq_bind = {rb_method = 1869573999, rb_cred = {bv_len = 8029759185026510703, bv_val = 0x25 <Address 0x25 out of bounds>}, rb_edn = {bv_len = 4121411795907850290, bv_val = 0x5a303034303330 <Address 0x5a303034303330 out of bounds>}, rb_ssf = 32, rb_mech = {bv_len = 53, bv_val = 0x6 <Address 0x6 out of bounds>}}, oq_compare = {rs_ava = 0x6f6f6f6f6f6f6f6f}, oq_modify = {rs_mods = {rs_modlist = 0x6f6f6f6f6f6f6f6f, rs_no_opattrs = 111 'o'}, rs_increment = 37}, oq_modrdn = {rs_mods = {rs_modlist = 0x6f6f6f6f6f6f6f6f, rs_no_opattrs = 111 'o'}, rs_deleteoldrdn = 37, rs_newrdn = {bv_len = 4121411795907850290, bv_val = 0x5a303034303330 <Address 0x5a303034303330 out of bounds>}, rs_nnewrdn = {bv_len = 32, bv_val = 0x35 <Address 0x35 out of bounds>}, rs_newSup = 0x6, rs_nnewSup = 0x7f14b01bc820}, oq_search = {rs_scope = 1869573999, rs_deref = 1869573999, rs_slimit = 1869573999, rs_tlimit = 1869573999, rs_limit = 0x25, rs_attrsonly = 875638834, rs_attrs = 0x5a303034303330, rs_filter = 0x20, rs_filterstr = {bv_len = 53, bv_val = 0x6 <Address 0x6 out of bounds>}}, oq_abandon = {rs_msgid = 1869573999}, oq_cancel = {rs_msgid = 1869573999}, oq_extended = {rs_reqoid = {bv_len = 8029759185026510703, bv_val = 0x6f6f6f6f6f6f6f6f <Address 0x6f6f6f6f6f6f6f6f out of bounds>}, rs_flags = 37, rs_reqdata = 0x3932323134313032}, oq_pwdexop = {rs_extended = {rs_reqoid = {bv_len = 8029759185026510703, bv_val = 0x6f6f6f6f6f6f6f6f <Address 0x6f6f6f6f6f6f6f6f out of bounds>}, rs_flags = 37, rs_reqdata = 0x3932323134313032}, rs_old = {bv_len = 25385731496096560, bv_val = 0x20 <Address 0x20 out of bounds>}, rs_new = {bv_len = 53, bv_val = 0x6 <Address 0x6 out of bounds>}, rs_mods = 0x7f14b01bc820, rs_modtail = 0x0}}, o_abandon = 0, o_cancel = 0, o_groups = 0x6f6f6f6f6f6f6f6f, o_do_not_cache = 53 '5', o_is_auth_check = 0 '\000', o_dont_replicate = 0 '\000', o_acl_priv = ACL_NONE, o_nocaching = 36 '$', o_delete_glue_parent = 0 '\000', o_no_schema_check = 0 '\000', o_no_subordinate_glue = 0 '\000', o_ctrlflag = "\000\000\000\000ã\033\260\024\177", '\000' <repeats 18 times>, "oooo", o_controls = 0x25, o_authz = { sai_method = 3751589900465327636, sai_mech = {bv_len = 1617057180469906565, bv_val = 0x0}, sai_dn = {bv_len = 53, bv_val = 0xf <Address 0xf out of bounds>}, sai_ndn = {bv_len = 139726839426656, bv_val = 0x0}, sai_ssf = 0, sai_transport_ssf = 0, sai_tls_ssf = 48, sai_sasl_ssf = 0}, o_ber = 0x25, o_res_ber = 0x3932323134313032, o_callback = 0x5a303034303330, o_ctrls = 0x6f6f6f6f6f007972, o_csn = {bv_len = 37, bv_val = 0x3932323134313032 <Address 0x3932323134313032 out of bounds>}, o_private = 0x5a303034303330, o_extra = {slh_first = 0x7972}, o_next = {stqe_next = 0x35}} (gdb) p *op $4 = {o_hdr = 0x7f14efffe820, o_tag = 80, o_time = 0, o_tincr = 0, o_bd = 0x7f14efffe5d0, o_req_dn = {bv_len = 0, bv_val = 0x0}, o_req_ndn = {bv_len = 0, bv_val = 0x0}, o_request = {oq_add = { rs_modlist = 0x3, rs_e = 0x0}, oq_bind = {rb_method = 3, rb_cred = {bv_len = 0, bv_val = 0x0}, rb_edn = {bv_len = 0, bv_val = 0x0}, rb_ssf = 0, rb_mech = {bv_len = 0, bv_val = 0x0}}, oq_compare = { rs_ava = 0x3}, oq_modify = {rs_mods = {rs_modlist = 0x3, rs_no_opattrs = 0 '\000'}, rs_increment = 0}, oq_modrdn = {rs_mods = {rs_modlist = 0x3, rs_no_opattrs = 0 '\000'}, rs_deleteoldrdn = 0, rs_newrdn = {bv_len = 0, bv_val = 0x0}, rs_nnewrdn = {bv_len = 0, bv_val = 0x0}, rs_newSup = 0x0, rs_nnewSup = 0x0}, oq_search = {rs_scope = 3, rs_deref = 0, rs_slimit = 0, rs_tlimit = 0, rs_limit = 0x0, rs_attrsonly = 0, rs_attrs = 0x0, rs_filter = 0x0, rs_filterstr = {bv_len = 0, bv_val = 0x0}}, oq_abandon = {rs_msgid = 3}, oq_cancel = {rs_msgid = 3}, oq_extended = {rs_reqoid = { bv_len = 3, bv_val = 0x0}, rs_flags = 0, rs_reqdata = 0x0}, oq_pwdexop = {rs_extended = {rs_reqoid = {bv_len = 3, bv_val = 0x0}, rs_flags = 0, rs_reqdata = 0x0}, rs_old = {bv_len = 0, bv_val = 0x0}, rs_new = {bv_len = 0, bv_val = 0x0}, rs_mods = 0x0, rs_modtail = 0x0}}, o_abandon = 0, o_cancel = 0, o_groups = 0x0, o_do_not_cache = 0 '\000', o_is_auth_check = 0 '\000', o_dont_replicate = 0 '\000', o_acl_priv = ACL_NONE, o_nocaching = 0 '\000', o_delete_glue_parent = 0 '\000', o_no_schema_check = 0 '\000', o_no_subordinate_glue = 0 '\000', o_ctrlflag = '\000' <repeats 31 times>, o_controls = 0x0, o_authz = {sai_method = 0, sai_mech = {bv_len = 0, bv_val = 0x0}, sai_dn = {bv_len = 0, bv_val = 0x0}, sai_ndn = {bv_len = 0, bv_val = 0x0}, sai_ssf = 0, sai_transport_ssf = 0, sai_tls_ssf = 0, sai_sasl_ssf = 0}, o_ber = 0x0, o_res_ber = 0x0, o_callback = 0x7f14efffe5a0, o_ctrls = 0x0, o_csn = {bv_len = 0, bv_val = 0x0}, o_private = 0x0, o_extra = {slh_first = 0x0}, o_next = {stqe_next = 0x0}} (gdb) p *soprev $5 = {s_next = 0x7f14b444cd30, s_base = {bv_len = 15, bv_val = 0x7f14e063fb20 "dc=ngdr,dc=ldap"}, s_eid = 4, s_op = 0x7f14e0260c70, s_rid = 4, s_sid = 2, s_filterstr = {bv_len = 15, bv_val = 0x7f14e0000b18 "\300\f"}, s_flags = 2, s_inuse = 1, s_res = 0x0, s_restail = 0x0, s_mutex = {__data = {__lock = 0, __count = 0, __owner = 0, __nusers = 0, __kind = 0, __spins = 0, __elision = 0, __list = {__prev = 0x0, __next = 0x0}}, __size = '\000' <repeats 39 times>, __align = 0}} (gdb) p op->o_hdr $6 = (Opheader *) 0x7f14efffe820 (gdb) p *op->o_hdr $7 = {oh_opid = 0, oh_connid = 15472, oh_conn = 0x7f15178fe390, oh_msgid = 0, oh_protocol = 0, oh_tid = 0, oh_threadctx = 0x0, oh_tmpmemctx = 0x0, oh_tmpmfuncs = 0x0, oh_counters = 0x0, oh_log_prefix = '\000' <repeats 255 times>} (gdb) p *op->o_hdr->oh_conn $8 = {c_struct_state = SLAP_C_USED, c_conn_state = SLAP_C_CLOSING, c_conn_idx = 298, c_sd = 298, c_close_reason = 0x538d20 <conn_lost_str> "connection lost", c_mutex = {__data = {__lock = 1, __count = 0, __owner = 30051, __nusers = 1, __kind = 0, __spins = 0, __elision = 0, __list = {__prev = 0x0, __next = 0x0}}, __size = "\001\000\000\000\000\000\000\000cu\000\000\001", '\000' <repeats 26 times>, __align = 1}, c_sb = 0x7f14d43369e0, c_starttime = 1419822255, c_activitytime = 1419822255, c_connid = 15472, c_peer_domain = {bv_len = 7, bv_val = 0x7f14d495fdc0 "unknown"}, c_peer_name = { bv_len = 18, bv_val = 0x7f14d495be10 "IP=127.0.0.1:52784"}, c_listener = 0x231d210, c_sasl_bind_mech = {bv_len = 0, bv_val = 0x0}, c_sasl_dn = {bv_len = 0, bv_val = 0x0}, c_sasl_authz_dn = { bv_len = 0, bv_val = 0x0}, c_authz_backend = 0x2388eb0, c_authz_cookie = 0x0, c_authz = {sai_method = 128, sai_mech = {bv_len = 0, bv_val = 0x0}, sai_dn = {bv_len = 7, bv_val = 0x7f14a8adeef0 "dc=ldap"}, sai_ndn = {bv_len = 7, bv_val = 0x7f14a8c3e860 "dc=ldap"}, sai_ssf = 0, sai_transport_ssf = 0, sai_tls_ssf = 0, sai_sasl_ssf = 0}, c_protocol = 3, c_ops = { stqh_first = 0x7f14c13dfa50, stqh_last = 0x7f14c13dfbb8}, c_pending_ops = {stqh_first = 0x0, stqh_last = 0x7f15178fe4b8}, c_write1_mutex = {__data = {__lock = 0, __count = 0, __owner = 0, __nusers = 0, __kind = 0, __spins = 0, __elision = 0, __list = {__prev = 0x0, __next = 0x0}}, __size = '\000' <repeats 39 times>, __align = 0}, c_write1_cv = {__data = {__lock = 0, __futex = 0, __total_seq = 0, __wakeup_seq = 0, __woken_seq = 0, __mutex = 0x0, __nwaiters = 0, __broadcast_seq = 0}, __size = '\000' <repeats 47 times>, __align = 0}, c_write2_mutex = {__data = {__lock = 0, __count = 0, __owner = 0, __nusers = 0, __kind = 0, __spins = 0, __elision = 0, __list = {__prev = 0x0, __next = 0x0}}, __size = '\000' <repeats 39 times>, __align = 0}, c_write2_cv = {__data = { __lock = 0, __futex = 0, __total_seq = 0, __wakeup_seq = 0, __woken_seq = 0, __mutex = 0x0, __nwaiters = 0, __broadcast_seq = 0}, __size = '\000' <repeats 47 times>, __align = 0}, c_currentber = 0x0, c_writers = 0, c_writing = 0 '\000', c_sasl_bind_in_progress = 0 '\000', c_writewaiter = 0 '\000', c_is_tls = 0 '\000', c_needs_tls_accept = 0 '\000', c_sasl_layers = 0 '\000', c_sasl_done = 0 '\000', c_sasl_authctx = 0x0, c_sasl_sockctx = 0x0, c_sasl_extra = 0x0, c_sasl_bindop = 0x0, c_pagedresults_state = {ps_be = 0x0, ps_size = 0, ps_count = 0, ps_cookie = 0, ps_cookieval = {bv_len = 0, bv_val = 0x0}}, c_n_ops_received = 3, c_n_ops_executing = 1, c_n_ops_pending = 0, c_n_ops_completed = 2, c_n_get = 3, c_n_read = 3, c_n_write = 0, c_extensions = 0x0, c_clientfunc = 0x0, c_clientarg = 0x0, c_send_ldap_result = 0x435340 <slap_send_ldap_result>, c_send_search_entry = 0x435d80 <slap_send_search_entry>, c_send_search_reference = 0x437270 <slap_send_search_reference>, c_send_ldap_extended = 0x435a50 <slap_send_ldap_extended>, c_send_ldap_intermediate = 0x435bf0 <slap_send_ldap_intermediate>}

1 0

(ITS#8012) SIGSEGV while disconnect/abandon
by leo＠yuriev.ru 29 Dec '14

29 Dec '14

Full_Name: Leonid Yuriev Version: 2.4-HEAD OS: Ubuntu 14.10 URL: ftp://ftp.openldap.org/incoming/ Submission from: (NULL) (31.130.36.33) with addition into main(): + mallopt(M_CHECK_ACTION, 7); + mallopt(M_PERTURB, 111); Core was generated by `/opt/openldap.devel/libexec/slapd -l LOCAL5 -d 32768 -s 0 -4 -h ldap://10.4.0.1'. Program terminated with signal 11, Segmentation fault. #0 0x000000000051025d in syncprov_op_abandon (op=0x7f14efffe970, rs=0x7f14efffe7b0) at syncprov.c:1134 1134 if ( so->s_op->o_connid == op->o_connid && (gdb) bt #0 0x000000000051025d in syncprov_op_abandon (op=7x7f14efffe970, rs=0x7f14efffe7b0) at syncprov.c:1134 #1 0x000000000048ae3a in overlay_op_walk (op=op@entry=0x7f14efffe970, rs=0x7f14efffe7b0, which=op_abandon, oi=0x23b3030, on=0x23b3210) at backover.c:661 #2 0x000000000048afd1 in over_op_func (op=0x7f14efffe970, rs=<optimised out>, which=<optimised out>) at backover.c:730 #3 0x0000000000442ea7 in fe_op_abandon (op=0x7f14efffe970, rs=0x7f14efffe7b0) at abandon.c:136 #4 0x0000000000422d3c in connection_abandon (c=c@entry=0x7f15178fe390) at connection.c:747 #5 0x0000000000424a09 in connection_closing (c=0x7f15178fe390, why=0x538d20 <conn_lost_str> "connection lost") at connection.c:820 #6 0x00000000004255ef in connection_read (cri=<optimised out>, s=<optimised out>) at connection.c:1476 #7 connection_read_thread (ctx=0x7f14efffebd0, argv=0x12a) at connection.c:1284 #8 0x00007f1517613cf2 in ldap_int_thread_pool_wrapper (xpool=0x233d090) at tpool.c:688 #9 0x00007f1516c930a5 in start_thread () from /lib/x86_64-linux-gnu/libpthread.so.0 coredump is available and additional info could be provided.

1 0

Re: (ITS#8011) few mistakes in lmdb-backend
by leo＠yuriev.ru 29 Dec '14

29 Dec '14

--e89a8f8389d11704db050b564d2b Content-Type: multipart/alternative; boundary=e89a8f8389d11704d5050b564d29 --e89a8f8389d11704d5050b564d29 Content-Type: text/plain; charset=UTF-8 Updated. Please pickup. Leonid. 2014-12-29 1:13 GMT+03:00 Howard Chu <hyc(a)symas.com>: > leo(a)yuriev.ru wrote: > >> @@ -1265,8 +1264,10 @@ static void *search_stack( Operation *op ) >> } >> >> if ( !ret ) { >> - ret = ch_malloc( mdb->mi_search_stack_depth * >> MDB_IDL_UM_SIZE >> - * sizeof( ID ) ); >> + size_t case_stack = mdb->mi_search_stack_depth * >> MDB_IDL_UM_SIZE * sizeof( ID ); >> + size_t case_sctmp = MDB_IDL_UM_SIZE * sizeof( ID2 ); >> + size_t size = (case_stack > case_sctmp) ? case_stack : >> case_sctmp; >> + ret = ch_malloc( size ); >> if ( op->o_threadctx ) { >> ldap_pvt_thread_pool_setkey( op->o_threadctx, >> (void *)search_stack, >> ret, search_stack_free, NULL, NULL ); >> >> > Unnecessary. > > -- > -- Howard Chu > CTO, Symas Corp. http://www.symas.com > Director, Highland Sun http://highlandsun.com/hyc/ > Chief Architect, OpenLDAP http://www.openldap.org/project/ > --e89a8f8389d11704d5050b564d29 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr">Updated.<div>Please pickup.<div><br></div><div>Leonid.<br>= <div class=3D"gmail_extra"><br><div class=3D"gmail_quote">2014-12-29 1:13 G= MT+03:00 Howard Chu <span dir=3D"ltr"><<a href=3D"mailto:hyc@symas.com" = target=3D"_blank">hyc(a)symas.com</a>></span>:<br><blockquote class=3D"gma= il_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-lef= t:1ex"><a href=3D"mailto:leo@yuriev.ru" target=3D"_blank">leo(a)yuriev.ru</a>= wrote:<br> <blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p= x #ccc solid;padding-left:1ex"> @@ -1265,8 +1264,10 @@ static void *search_stack( Operation *op )<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 }<br> <br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 if ( !ret ) {<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ret =3D ch_malloc( = mdb->mi_search_stack_depth * MDB_IDL_UM_SIZE<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0* sizeof( ID ) );<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0size_t case_stack = =3D mdb->mi_search_stack_depth * MDB_IDL_UM_SIZE * sizeof( ID );<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0size_t case_sctmp = =3D MDB_IDL_UM_SIZE * sizeof( ID2 );<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0size_t size =3D (ca= se_stack > case_sctmp) ? case_stack : case_sctmp;<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ret =3D ch_malloc( = size );<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if ( op->o_threa= dctx ) {<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 ldap_pvt_thread_pool_setkey( op->o_threadctx, (void *)search_= stack,<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ret, search_stack_free, NULL, NULL )= ;<br> <br> </blockquote> <br> Unnecessary.<span class=3D"HOEnZb"><font color=3D"#888888"><br> <br> -- <br> =C2=A0 -- Howard Chu<br> =C2=A0 CTO, Symas Corp.=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<a href=3D"= http://www.symas.com" target=3D"_blank">http://www.symas.com</a><br> =C2=A0 Director, Highland Sun=C2=A0 =C2=A0 =C2=A0<a href=3D"http://highland= sun.com/hyc/" target=3D"_blank">http://highlandsun.com/hyc/</a><br> =C2=A0 Chief Architect, OpenLDAP=C2=A0 <a href=3D"http://www.openldap.org/p= roject/" target=3D"_blank">http://www.openldap.org/<u></u>project/</a><br> </font></span></blockquote></div><br></div></div></div></div> --e89a8f8389d11704d5050b564d29-- --e89a8f8389d11704db050b564d2b Content-Type: text/x-patch; charset=US-ASCII; name="its8011.patch" Content-Disposition: attachment; filename="its8011.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_i49k3q0m0 Y29tbWl0IDA1ODdiOTA0YWVhOWNkMmVjNjc2YWFjNzM2MDM0ODNiODA1ODE2ZTAKQXV0aG9yOiBM ZW8gWXVyaWV2IDxsZW9AeXVyaWV2LnJ1PgpEYXRlOiAgIDIwMTQtMTItMjggMjM6MTQ6NTIgKzAz MDAKCiAgICBJVFMjODAxMTogZmV3IGNvcnJlY3Rpb25zIGZvciBsbWRiLWJhY2tlbmQ7CiAgICAK ICAgICBkbjJpZC5jOgogICAgICAgKyBhc3NlcnRpb24gZm9yIG1kYl9pZDJsX2luc2VydCgpIHJl c3VsdDsKICAgICAgIC0gdW5uZWNlc3NhcnkgYXNzaWdubWVudDsKICAgIAogICAgIHNlYXJjaC5j OgogICAgICAgLSB1bnVzZWQgdmFyaWFibGUgJ2ZpcnN0JzsKICAgICAgICsgcmFuZ2UtY2hlY2sg Zm9yIG1kYl9pZGxfc2VhcmNoKCkgcmVzdWx0OwoKZGlmZiAtLWdpdCBhL3NlcnZlcnMvc2xhcGQv YmFjay1tZGIvZG4yaWQuYyBiL3NlcnZlcnMvc2xhcGQvYmFjay1tZGIvZG4yaWQuYwppbmRleCA0 MWM0NzU4Li4wODkwYmNlIDEwMDY0NAotLS0gYS9zZXJ2ZXJzL3NsYXBkL2JhY2stbWRiL2RuMmlk LmMKKysrIGIvc2VydmVycy9zbGFwZC9iYWNrLW1kYi9kbjJpZC5jCkBAIC03NDYsNyArNzQ2LDgg QEAgbWRiX2lkc2NvcGVzKAogCQkJLyogcmVtZW1iZXIgb3VyIGNoYWluIG9mIHBhcmVudHMgKi8K IAkJCWlkMi5taWQgPSBpZDsKIAkJCWlkMi5tdmFsID0gZGF0YTsKLQkJCW1kYl9pZDJsX2luc2Vy dCggaXNjLT5zY3RtcCwgJmlkMiApOworCQkJcmMgPSBtZGJfaWQybF9pbnNlcnQoIGlzYy0+c2N0 bXAsICZpZDIgKTsKKwkJCWFzc2VydChyYyA9PSAwKTsKIAkJfQogCQlwdHIgPSBkYXRhLm12X2Rh dGE7CiAJCXB0ciArPSBkYXRhLm12X3NpemUgLSBzaXplb2YoSUQpOwpAQCAtNzYwLDkgKzc2MSwx MSBAQCBtZGJfaWRzY29wZXMoCiAJCWlmICggeCA8PSBpc2MtPnNjb3Blc1swXS5taWQgJiYgaXNj LT5zY29wZXNbeF0ubWlkID09IGlkICkgewogCQkJaWYgKCAhaXNjLT5zY29wZXNbeF0ubXZhbC5t dl9kYXRhICkgewogCQkJCS8qIFRoaXMgbm9kZSBpcyBpbiBzY29wZSwgYWRkIHBhcmVudCBjaGFp biB0byBzY29wZSAqLwotCQkJCWludCBpID0gaXNjLT5zY3RtcFswXS5taWQ7Ci0JCQkJZm9yICgg aSA9IDE7IGkgPD0gaXNjLT5zY3RtcFswXS5taWQ7IGkrKyApCi0JCQkJCW1kYl9pZDJsX2luc2Vy dCggaXNjLT5zY29wZXMsICZpc2MtPnNjdG1wW2ldICk7CisJCQkJaW50IGk7CisJCQkJZm9yICgg aSA9IDE7IGkgPD0gaXNjLT5zY3RtcFswXS5taWQ7IGkrKyApIHsKKwkJCQkJcmMgPSBtZGJfaWQy bF9pbnNlcnQoIGlzYy0+c2NvcGVzLCAmaXNjLT5zY3RtcFtpXSApOworCQkJCQlhc3NlcnQocmMg PT0gMCk7CisJCQkJfQogCQkJCS8qIGNoZWNrIGlkIGFnYWluIHNpbmNlIGluc2VydHMgbWF5IGhh dmUgY2hhbmdlZCBpdHMgcG9zaXRpb24gKi8KIAkJCQlpZiAoIGlzYy0+c2NvcGVzW3hdLm1pZCAh PSBpZCApCiAJCQkJCXggPSBtZGJfaWQybF9zZWFyY2goIGlzYy0+c2NvcGVzLCBpZCApOwpkaWZm IC0tZ2l0IGEvc2VydmVycy9zbGFwZC9iYWNrLW1kYi9zZWFyY2guYyBiL3NlcnZlcnMvc2xhcGQv YmFjay1tZGIvc2VhcmNoLmMKaW5kZXggOTA4OTAxNi4uMTg1ZDlmMSAxMDA2NDQKLS0tIGEvc2Vy dmVycy9zbGFwZC9iYWNrLW1kYi9zZWFyY2guYworKysgYi9zZXJ2ZXJzL3NsYXBkL2JhY2stbWRi L3NlYXJjaC5jCkBAIC0xNDAsNyArMTQwLDYgQEAgc3RhdGljIGludCBzZWFyY2hfYWxpYXNlcygK IAlzdHJ1Y3QgYmVydmFsIGJ2X2FsaWFzID0gQkVSX0JWQyggImFsaWFzIiApOwogCUF0dHJpYnV0 ZUFzc2VydGlvbiBhYV9hbGlhcyA9IEFUVFJJQlVURUFTU0VSVElPTl9JTklUOwogCUZpbHRlcglh ZjsKLQlpbnQgZmlyc3QgPSAxOwogCiAJYWxpYXNlcyA9IHN0YWNrOwkvKiBJREwgb2YgYWxsIGFs aWFzZXMgaW4gdGhlIGRhdGFiYXNlICovCiAJY3Vyc2NvcCA9IGFsaWFzZXMgKyBNREJfSURMX0RC X1NJWkU7CS8qIEFsaWFzZXMgaW4gdGhlIGN1cnJlbnQgc2NvcGUgKi8KQEAgLTgwNyw3ICs4MDYs NyBAQCBsb29wX2JlZ2luOgogCQkJCQlzY29wZW9rID0gMTsKIAkJCX0gZWxzZSB7CiAJCQkJaSA9 IG1kYl9pZGxfc2VhcmNoKCBjYW5kaWRhdGVzLCBpZCApOwotCQkJCWlmICggY2FuZGlkYXRlc1tp XSA9PSBpZCApCisJCQkJaWYgKGkgPD0gY2FuZGlkYXRlc1swXSAmJiBjYW5kaWRhdGVzW2ldID09 IGlkICkKIAkJCQkJc2NvcGVvayA9IDE7CiAJCQl9CiAJCQlpZiAoIHNjb3Blb2sgKQo= --e89a8f8389d11704db050b564d2b--

1 0

Re: (ITS#8011) few mistakes in lmdb-backend
by hyc＠symas.com 28 Dec '14

28 Dec '14

leo(a)yuriev.ru wrote: > @@ -1265,8 +1264,10 @@ static void *search_stack( Operation *op ) > } > > if ( !ret ) { > - ret = ch_malloc( mdb->mi_search_stack_depth * MDB_IDL_UM_SIZE > - * sizeof( ID ) ); > + size_t case_stack = mdb->mi_search_stack_depth * MDB_IDL_UM_SIZE * sizeof( ID ); > + size_t case_sctmp = MDB_IDL_UM_SIZE * sizeof( ID2 ); > + size_t size = (case_stack > case_sctmp) ? case_stack : case_sctmp; > + ret = ch_malloc( size ); > if ( op->o_threadctx ) { > ldap_pvt_thread_pool_setkey( op->o_threadctx, (void *)search_stack, > ret, search_stack_free, NULL, NULL ); > Unnecessary. -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#8011) few mistakes in lmdb-backend
by leo＠yuriev.ru 28 Dec '14

28 Dec '14

This is a multi-part message in MIME format. --------------060206050400040309010905 Content-Type: text/plain; charset=windows-1251; format=flowed Content-Transfer-Encoding: 7bit The attached files is derived from OpenLDAP Software. All of the modifications to OpenLDAP Software represented in the following patch(es) were developed by Peter-Service LLC, Moscow, Russia. Peter-Service LLC has not assigned rights and/or interest in this work to any party. I, Leonid Yuriev am authorized by Peter-Service LLC, my employer, to release this work under the following terms. Peter-Service LLC hereby places the following modifications to OpenLDAP Software (and only these modifications) into the public domain. Hence, these modifications may be freely used and/or redistributed for any purpose with or without attribution and/or other notice. --------------060206050400040309010905 Content-Type: text/x-patch; name="ITS8011.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="ITS8011.patch" commit 1bdae5a756d803961db4d2c7f6d13e975f89f1f8 Author: Leo Yuriev <leo(a)yuriev.ru> Date: 2014-12-28 23:14:52 +0300 ITS#8011: few corrections for lmdb-backend; dn2id.c: + assertion for mdb_id2l_insert() result; - unnecessary assignment; search.c: - unused variable 'first'; + range-check for mdb_idl_search() result; * fix sctmp/stack allocation size; diff --git a/servers/slapd/back-mdb/dn2id.c b/servers/slapd/back-mdb/dn2id.c index 41c4758..0890bce 100644 --- a/servers/slapd/back-mdb/dn2id.c +++ b/servers/slapd/back-mdb/dn2id.c @@ -746,7 +746,8 @@ mdb_idscopes( /* remember our chain of parents */ id2.mid = id; id2.mval = data; - mdb_id2l_insert( isc->sctmp, &id2 ); + rc = mdb_id2l_insert( isc->sctmp, &id2 ); + assert(rc == 0); } ptr = data.mv_data; ptr += data.mv_size - sizeof(ID); @@ -760,9 +761,11 @@ mdb_idscopes( if ( x <= isc->scopes[0].mid && isc->scopes[x].mid == id ) { if ( !isc->scopes[x].mval.mv_data ) { /* This node is in scope, add parent chain to scope */ - int i = isc->sctmp[0].mid; - for ( i = 1; i <= isc->sctmp[0].mid; i++ ) - mdb_id2l_insert( isc->scopes, &isc->sctmp[i] ); + int i; + for ( i = 1; i <= isc->sctmp[0].mid; i++ ) { + rc = mdb_id2l_insert( isc->scopes, &isc->sctmp[i] ); + assert(rc == 0); + } /* check id again since inserts may have changed its position */ if ( isc->scopes[x].mid != id ) x = mdb_id2l_search( isc->scopes, id ); diff --git a/servers/slapd/back-mdb/search.c b/servers/slapd/back-mdb/search.c index 9089016..8bcdc10 100644 --- a/servers/slapd/back-mdb/search.c +++ b/servers/slapd/back-mdb/search.c @@ -140,7 +140,6 @@ static int search_aliases( struct berval bv_alias = BER_BVC( "alias" ); AttributeAssertion aa_alias = ATTRIBUTEASSERTION_INIT; Filter af; - int first = 1; aliases = stack; /* IDL of all aliases in the database */ curscop = aliases + MDB_IDL_DB_SIZE; /* Aliases in the current scope */ @@ -807,7 +806,7 @@ loop_begin: scopeok = 1; } else { i = mdb_idl_search( candidates, id ); - if ( candidates[i] == id ) + if (i <= candidates[0] && candidates[i] == id ) scopeok = 1; } if ( scopeok ) @@ -1265,8 +1264,10 @@ static void *search_stack( Operation *op ) } if ( !ret ) { - ret = ch_malloc( mdb->mi_search_stack_depth * MDB_IDL_UM_SIZE - * sizeof( ID ) ); + size_t case_stack = mdb->mi_search_stack_depth * MDB_IDL_UM_SIZE * sizeof( ID ); + size_t case_sctmp = MDB_IDL_UM_SIZE * sizeof( ID2 ); + size_t size = (case_stack > case_sctmp) ? case_stack : case_sctmp; + ret = ch_malloc( size ); if ( op->o_threadctx ) { ldap_pvt_thread_pool_setkey( op->o_threadctx, (void *)search_stack, ret, search_stack_free, NULL, NULL ); --------------060206050400040309010905--

1 0

(ITS#8011) few mistakes in lmdb-backend
by leo＠yuriev.ru 28 Dec '14

28 Dec '14

Full_Name: Leonid Yuriev Version: master OS: RHEL7 URL: ftp://ftp.openldap.org/incoming/ Submission from: (NULL) (31.130.36.33) Please review the patch, which will be attached shortly. mdb_idscopes(): + assertion for mdb_id2l_insert() result; - unnecessary assignment; static search_aliases(): - unused variable 'first'; + range-check for mdb_idl_search() result; static search_stack(): * fix sctmp/stack allocation size;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

openldap-bugs