From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marco Munderloh Subject: [PATCH V2] catch acl==NULL in __jfs_set_acl (fixed null pointer dereference) Date: Tue, 29 Apr 2014 19:59:51 +0200 Message-ID: <535FE897.9040607@tnt.uni-hannover.de> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms010504000103050403010206" To: linux-fsdevel@vger.kernel.org Return-path: Received: from mailout3.uni-hannover.de ([130.75.2.104]:46507 "EHLO mailout3.uni-hannover.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933160AbaD2R7x (ORCPT ); Tue, 29 Apr 2014 13:59:53 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout3.uni-hannover.de (Postfix) with ESMTP id 05AACD808DA for ; Tue, 29 Apr 2014 19:59:52 +0200 (CEST) Received: from mailout3.uni-hannover.de ([127.0.0.1]) by localhost (mailout3.uni-hannover.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hCtihlYhuub7 for ; Tue, 29 Apr 2014 19:59:51 +0200 (CEST) Received: from mailhost.tnt.uni-hannover.de (mailhost.tnt.uni-hannover.de [130.75.31.4]) by mailout3.uni-hannover.de (Postfix) with ESMTP id DD6DFD80894 for ; Tue, 29 Apr 2014 19:59:51 +0200 (CEST) Received: from [130.75.31.42] (nebuchadnezzar.tnt.uni-hannover.de [130.75.31.42]) by mailhost.tnt.uni-hannover.de (Postfix) with ESMTPSA id 70983BF449 for ; Tue, 29 Apr 2014 19:59:51 +0200 (CEST) Sender: linux-fsdevel-owner@vger.kernel.org List-ID: This is a cryptographically signed message in MIME format. --------------ms010504000103050403010206 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable changes V2: I forgot to set rc =3D 0, leaving it uninitialized if acl was= NULL. --- linux-3.14.2.vanilla/fs/jfs/acl.c 2014-04-28 17:24:55.544597204 +0200= +++ linux-3.14.2/fs/jfs/acl.c 2014-04-29 19:57:27.028465728 +0200 @@ -83,13 +83,16 @@ switch (type) { case ACL_TYPE_ACCESS: ea_name =3D POSIX_ACL_XATTR_ACCESS; - rc =3D posix_acl_equiv_mode(acl, &inode->i_mode); - if (rc < 0) - return rc; - inode->i_ctime =3D CURRENT_TIME; - mark_inode_dirty(inode); - if (rc =3D=3D 0) - acl =3D NULL; + if( acl ) { + rc =3D posix_acl_equiv_mode(acl, &inode->i_mode); + if (rc < 0) + return rc; + inode->i_ctime =3D CURRENT_TIME; + mark_inode_dirty(inode); + if (rc =3D=3D 0) + acl =3D NULL; + } + rc =3D 0; break; case ACL_TYPE_DEFAULT: ea_name =3D POSIX_ACL_XATTR_DEFAULT; --------------ms010504000103050403010206 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIOrDCC BHQwggNcoAMCAQICCQCJkBEVWD6HmzANBgkqhkiG9w0BAQsFADBxMQswCQYDVQQGEwJERTEc MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0 IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNMTQwMjEx MTMxMTQ1WhcNMTkwNzA5MjM1OTAwWjBaMQswCQYDVQQGEwJERTETMBEGA1UEChMKREZOLVZl cmVpbjEQMA4GA1UECxMHREZOLVBLSTEkMCIGA1UEAxMbREZOLVZlcmVpbiBQQ0EgR2xvYmFs IC0gRzAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6ZvDZ4X5Da71jVTDllA1 PWLpbkztlNcAW5UidNQg6zSP1uzAMQQLmYHiphTSUqAoI4SLdIkEXlvg4njBeMsWyyg1OXst kEXQ7aAAeny/Sg4bAMOG6VwrMRF7DPOCJEOMHDiLamgAmu7cT3ir0sYTm3at7t4m6O8Br3QP wQmi9mvOvdPNFDBP9eXjpMhim4IaAycwDQJlYE3t0QkjKpY1WCfTdsZxtpAdxO3/NYZ9bzOz 2w/FEcKKg6GUXUFr2NIQ9Uz9ylGs2b3vkoO72uuLFlZWQ8/h1RM9ph8nMM1JVNvJEzSacXXF bOqnC5j5IZ0nrz6jOTlIaoytyZn7wxLyvQIDAQABo4IBJDCCASAwDgYDVR0PAQH/BAQDAgEG MB0GA1UdDgQWBBRJt8bP6D0ff+pEexMp9/EKcD7eZDAfBgNVHSMEGDAWgBQxw3kbuvVT1xfg iXotF2wKsyudMzASBgNVHRMBAf8ECDAGAQH/AgECMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6 Ly9vY3NwMDMzNi50ZWxlc2VjLmRlL3JsL0RUX1JPT1RfQ0FfMi5jcmwweQYIKwYBBQUHAQEE bTBrMCwGCCsGAQUFBzABhiBodHRwOi8vb2NzcDAzMzYudGVsZXNlYy5kZS9vY3NwcjA7Bggr BgEFBQcwAoYvaHR0cDovL29jc3AwMzM2LnRlbGVzZWMuZGUvY3J0L0RUX1JPT1RfQ0FfMi5j ZXIwDQYJKoZIhvcNAQELBQADggEBACwvqeBeQy8FcNxRlXVdgI47DMFjWFSBMIOcXalRh8m2 1w8runhIJGBCzPGi4jPhMh4ym1ETlXnGtazQJO0YFLwvKuovq7ITrEkdXgALBBhqmmXU6Ec1 vK7t33S22PGAUGWgxtojm41TR8psu0DJlV1OYHor5LtmQFWvtjPB6iMhbvxUnd0zQm5Ma9Xk w/LqBrdaMmoyRXS2tW/+6v8cY6q7iNH4WK8gfo+///b3OHeLGrZQP609R3lGw1e0F2KHvZ6j NiUHaCSqIvL2rynsN6UUma66AWCGdS1hFbp4loe1ks/hUJGeWToV7J5axob8KD5mutTZNa+t PEkihYfub48wggTTMIIDu6ADAgECAgQKKFw+MA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYT AkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAwDgYDVQQLEwdERk4tUEtJMSQwIgYDVQQDExtE Rk4tVmVyZWluIFBDQSBHbG9iYWwgLSBHMDEwHhcNMDcwMzI3MDkwNjU1WhcNMTkwMzI2MDAw MDAwWjBnMQswCQYDVQQGEwJERTEmMCQGA1UEChMdTGVpYm5peiBVbml2ZXJzaXRhZXQgSGFu bm92ZXIxDTALBgNVBAsTBFJSWk4xITAfBgNVBAMTGENBIGRlciBMVUggKFVILUNBKSAtIEcw MzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANCo2/ZD3wqKhpm+JCoJHFVKqrBF mRE5rpUQk60wYTNOBL3AGB9mN0Va2ptmNnU9Dp9+8x5d8ZvJxTT14lLPQVjeatr+nDTh7faJ tqzfgv/N+OEGhlWdHLtDmOhmha12Hp5EEsMzSDW0IWy7AdLy737gRFjf53GqqMmpL5GKB6UE fqqLer/7aY31vqkVyuARqVEiP/8Y4dBjEDCwKyMqnINOXlLsH8xRveLe01O4tuCkmSyGT40f IZ2J6dpMM7rNV9HVLp4v00dCrI2GdmwO608NnXuGAnc5u3dvrXSCtIY1ObOp1zlojlKgTnFR E2t+a0ChczfEOv1IA81y+eekTWcCAwEAAaOCAZIwggGOMA8GA1UdEwEB/wQFMAMBAf8wCwYD VR0PBAQDAgEGMB0GA1UdDgQWBBTT++BN5E2IhfRRqW95denAKSEuEzAfBgNVHSMEGDAWgBRJ t8bP6D0ff+pEexMp9/EKcD7eZDCBiAYDVR0fBIGAMH4wPaA7oDmGN2h0dHA6Ly9jZHAxLnBj YS5kZm4uZGUvZ2xvYmFsLXJvb3QtY2EvcHViL2NybC9jYWNybC5jcmwwPaA7oDmGN2h0dHA6 Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXJvb3QtY2EvcHViL2NybC9jYWNybC5jcmwwgaIG CCsGAQUFBwEBBIGVMIGSMEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2ds b2JhbC1yb290LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBHBggrBgEFBQcwAoY7aHR0cDov L2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtcm9vdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw DQYJKoZIhvcNAQEFBQADggEBAM2AOvZ8GKaSmD/UA7Kr2U3x+YeOezmQ9KKgzze2HngTBUHs AsjI1ud4ZBB12x4DXbXW6D+8KnWsMS90cOJ/Y+I6vnV7PDylYeyhSbEmWKMHx43eZF7/VFfa fInAWtZsT2zJn6OcWqzHnny0FPwmkJrJMd3LJXkrRCs3BS6GSd0dPG9Nvkf2jXuWOTiOUAUp 1t1LDAwhI4zQ6INHo0iJBX8+KJn4mCoy6+He42eyj+o3AFB5rpb5VglzsgiHVvEVBKJVyl9u f7IzH+P4SLiDCQmQZ17lYc8kQXQKk6XLiQksk0TDYZUqHDhd3fKwBuftoqkyAxBlhATXWpRH 75CXGdEwggVZMIIEQaADAgECAgcWPVv1mariMA0GCSqGSIb3DQEBBQUAMGcxCzAJBgNVBAYT AkRFMSYwJAYDVQQKEx1MZWlibml6IFVuaXZlcnNpdGFldCBIYW5ub3ZlcjENMAsGA1UECxME UlJaTjEhMB8GA1UEAxMYQ0EgZGVyIExVSCAoVUgtQ0EpIC0gRzAzMB4XDTEzMDgyODExMjYy OVoXDTE2MDgyNzExMjYyOVowgYgxCzAJBgNVBAYTAkRFMRYwFAYDVQQIEw1OaWVkZXJzYWNo c2VuMREwDwYDVQQHEwhIYW5ub3ZlcjEmMCQGA1UEChMdTGVpYm5peiBVbml2ZXJzaXRhZXQg SGFubm92ZXIxDDAKBgNVBAsTA1ROVDEYMBYGA1UEAxMPTWFyY28gTXVuZGVybG9oMIIBIjAN BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtakqnQLqr4m3KwG2E2bx6YyeaYleD/SDwoeZ FpwkXr60jkltM3Imzz1xpF4Vs9eHMibudRuCmsaOgmUEM8fxXKEYUm7X2cG4dysI8WBI7Qc1 0KKY+6xAXEayR5IWUJF47PrHzrxJ9tdxqjwuqSsgqZ7mF7mLL0YzFzsDoHH2nO1B6tHDa7IO hqKJFiIm0VLBQLFlSeAu8443YNDCRGSVV2qnWiPz0TMN01PJS7QA4jM61VJ5Lv2nzYkafWB+ BDrxz5J93Z+73gIq+cXZVCPcW0FAu+cLXKANS3HtmRcWIeZKNpMYbYmA+YHLOjJWojZqbPqr HFRc8vt/PRd7N0p/IQIDAQABo4IB5jCCAeIwLwYDVR0gBCgwJjARBg8rBgEEAYGtIYIsAQEE AwAwEQYPKwYBBAGBrSGCLAIBBAMAMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW MBQGCCsGAQUFBwMCBggrBgEFBQcDBDAdBgNVHQ4EFgQUp9Q4z1vstaPkqHKk3ZAHxtFs6uUw HwYDVR0jBBgwFoAU0/vgTeRNiIX0UalveXXpwCkhLhMwJgYDVR0RBB8wHYEbbXVuZGVybEB0 bnQudW5pLWhhbm5vdmVyLmRlMHkGA1UdHwRyMHAwNqA0oDKGMGh0dHA6Ly9jZHAxLnBjYS5k Zm4uZGUvdWgtY2EvcHViL2NybC9nX2NhY3JsLmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNh LmRmbi5kZS91aC1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBA BggrBgEFBQcwAoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS91aC1jYS9wdWIvY2FjZXJ0L2df Y2FjZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS91aC1jYS9w dWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAu70gX9RCY8v7+W0t 7gcjsg+JZCdkwNDRZWzOQAvOgTq7wa6cJzjo0EciChi0MLZaLROvKhyveKedY3f8hQsagiE8 s9J7y5Dbe79jh/sJzf/g65/5WeXlk4dZdqI4eeK4I0Khv1Z74cCNJFtfp8Ul9Y9eYsTf/Na0 5AGM4TFFS/+7CjmH0hEmGjSx/kPfogIAGi+qLRWZ+aWbS4QPZzUJf2bd4ghbDW8oN02Y7iW2 vOBXRklHf62OQGaewkp7TraaQadybCvnSGBnDqOG6vFV4vuiUWQCSDlzEsc4WTYLgSspwaWl vYgxeO4BSzHrK6jl/CaNo5zwbbT328N5eqLwmzGCA3IwggNuAgEBMHIwZzELMAkGA1UEBhMC REUxJjAkBgNVBAoTHUxlaWJuaXogVW5pdmVyc2l0YWV0IEhhbm5vdmVyMQ0wCwYDVQQLEwRS UlpOMSEwHwYDVQQDExhDQSBkZXIgTFVIIChVSC1DQSkgLSBHMDMCBxY9W/WZquIwCQYFKw4D AhoFAKCCAdUwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMTQw NDI5MTc1OTUxWjAjBgkqhkiG9w0BCQQxFgQUpOkoUSyiim3oWILKCFY83cGyvBEwbAYJKoZI hvcNAQkPMV8wXTALBglghkgBZQMEASowCwYJYIZIAWUDBAECMAoGCCqGSIb3DQMHMA4GCCqG SIb3DQMCAgIAgDANBggqhkiG9w0DAgIBQDAHBgUrDgMCBzANBggqhkiG9w0DAgIBKDCBgQYJ KwYBBAGCNxAEMXQwcjBnMQswCQYDVQQGEwJERTEmMCQGA1UEChMdTGVpYm5peiBVbml2ZXJz aXRhZXQgSGFubm92ZXIxDTALBgNVBAsTBFJSWk4xITAfBgNVBAMTGENBIGRlciBMVUggKFVI LUNBKSAtIEcwMwIHFj1b9Zmq4jCBgwYLKoZIhvcNAQkQAgsxdKByMGcxCzAJBgNVBAYTAkRF MSYwJAYDVQQKEx1MZWlibml6IFVuaXZlcnNpdGFldCBIYW5ub3ZlcjENMAsGA1UECxMEUlJa TjEhMB8GA1UEAxMYQ0EgZGVyIExVSCAoVUgtQ0EpIC0gRzAzAgcWPVv1mariMA0GCSqGSIb3 DQEBAQUABIIBAGru6TUfJXYYfM1oxT2sakA4sZpb1i/vnsfsWgavB2nL/KnDkZcp5sx4sCN6 BtGWRa30N+HTtHhx80g/5RAMJekO/JQXN0z+WG2UudKgpxqr/u/gnNGJ43cs5Ad0vbgSM9pC YGezN5PnCKzyBgGRRKQE9Et2ozg6vUwTUR5ryg0p/FkRfUledYIOqVVEzGHtGYdvF9JHKLqJ oxhilsZNoRAJrxHTxL6N8L7ALArZXBktMBX2fE38YXj9yKYtl4qon3g58+6HduPZcpaqgnXY S1pUsR+iyeEbXhsEQkPKt83AazIjpinlbCv8I/afR/j75hB0Fi4ea7gKAqaj/9W65BQAAAAA AAA= --------------ms010504000103050403010206--