From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Marczykowski Subject: Re: [PATCH 6 of 6 RESENT] libxl: Do not SEGV when no 'removable' disk parameter in xenstore Date: Tue, 07 Jun 2011 14:00:18 +0200 Message-ID: <4DEE12D2.3000800@mimuw.edu.pl> References: <70fc2a0f0a6003f1bf59.1307292636@devel14> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0931118657==" Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Stefano Stabellini Cc: "xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org This is a cryptographically signed message in MIME format. --===============0931118657== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms010204030309080703070200" This is a cryptographically signed message in MIME format. --------------ms010204030309080703070200 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 07.06.2011 13:57, Stefano Stabellini wrote: > On Sun, 5 Jun 2011, Marek Marczykowski wrote: >> # HG changeset patch >> # User Marek Marczykowski >> # Date 1307145395 -7200 >> # Node ID 70fc2a0f0a6003f1bf591cd941a841a9e6b69c01 >> # Parent 0c0f9e1bd14073b5cb1d4f58b6950d16128003fa >> libxl: Do not SEGV when no 'removable' disk parameter in xenstore >> >> Just assume disk as not removable when no 'removable' paremeter >> >> Signed-off-by: Marek Marczykowski >> >> diff -r 0c0f9e1bd140 -r 70fc2a0f0a60 tools/libxl/libxl.c >> --- a/tools/libxl/libxl.c Sat Jun 04 01:52:11 2011 +0200 >> +++ b/tools/libxl/libxl.c Sat Jun 04 01:56:35 2011 +0200 >> @@ -1563,6 +1563,7 @@ static unsigned int libxl__append_disk_l >> libxl__xs_get_dompath(gc, 0), type, domi= d); >> dir =3D libxl__xs_directory(gc, XBT_NULL, be_path, &n); >> if (dir) { >> + char *removable; >> *disks =3D realloc(*disks, sizeof (libxl_device_disk) * (*ndi= sks + n)); >> pdisk =3D *disks + *ndisks; >> *ndisks +=3D n; >> @@ -1581,6 +1582,11 @@ static unsigned int libxl__append_disk_l >> &(pdisk->backend)); >> pdisk->vdev =3D xs_read(ctx->xsh, XBT_NULL, libxl__sprint= f(gc, "%s/%s/dev", be_path, *dir), &len); >> pdisk->unpluggable =3D atoi(libxl__xs_read(gc, XBT_NULL, = libxl__sprintf(gc, "%s/%s/removable", be_path, *dir))); >=20 > shouldn't you be removing this ^ line?=20 Yes, should be... >=20 >> + removable =3D libxl__xs_read(gc, XBT_NULL, libxl__sprintf= (gc, "%s/%s/removable", be_path, *dir)); >> + if (removable) >> + pdisk->unpluggable =3D atoi(removable); >> + else >> + pdisk->unpluggable =3D 0; >> if (!strcmp(libxl__xs_read(gc, XBT_NULL, libxl__sprintf(g= c, "%s/%s/mode", be_path, *dir)), "w")) >> pdisk->readwrite =3D 1; >> else >> >> >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xensource.com >> http://lists.xensource.com/xen-devel >> --=20 Pozdrawiam / Best Regards, Marek Marczykowski | RLU #390519 marmarek at mimuw edu pl | xmpp:marmarek at staszic waw pl --------------ms010204030309080703070200 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIRqDCC BVcwggQ/oAMCAQICEGdLwnOg7SU/xzieX7FaFewwDQYJKoZIhvcNAQEFBQAwgd0xCzAJBgNV BAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1 c3QgTmV0d29yazE7MDkGA1UECxMyVGVybXMgb2YgdXNlIGF0IGh0dHBzOi8vd3d3LnZlcmlz aWduLmNvbS9ycGEgKGMpMDkxHjAcBgNVBAsTFVBlcnNvbmEgTm90IFZhbGlkYXRlZDE3MDUG A1UEAxMuVmVyaVNpZ24gQ2xhc3MgMSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0EgLSBHMzAe Fw0xMDEyMDgwMDAwMDBaFw0xMTEyMDgyMzU5NTlaMIIBGjEXMBUGA1UEChMOVmVyaVNpZ24s IEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxRjBEBgNVBAsTPXd3dy52 ZXJpc2lnbi5jb20vcmVwb3NpdG9yeS9SUEEgSW5jb3JwLiBieSBSZWYuLExJQUIuTFREKGMp OTgxHjAcBgNVBAsTFVBlcnNvbmEgTm90IFZhbGlkYXRlZDEzMDEGA1UECxMqRGlnaXRhbCBJ RCBDbGFzcyAxIC0gTmV0c2NhcGUgRnVsbCBTZXJ2aWNlMRswGQYDVQQDFBJNQVJFSyBNYXJj enlrb3dza2kxJDAiBgkqhkiG9w0BCQEWFW1hcm1hcmVrQG1pbXV3LmVkdS5wbDCCASIwDQYJ KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMGGGDj1KJXXy13nNqo0NP7EJNnzjWHih+Z88UA/ c/CZOIu3/SUnA9gly922moQ+r4AM0k6EQaVkAdldSOy1hO/fTcJQBwDemcnACWstMDMvIbWn dkxyxNgh8bQD/xKXx1SyfKTixcx0QZXosY8HnHLWeF0Te5U9J8yUPxigCFJFe6rtY2iARrWc qWXDr4DRQc5J43aohBXGRHw+OakREqLZds6HEE6+YvJH+udcfqlrfkLKHJeiyA4UPtZwBvam EGOKrm2rqyps/JeivaTs6zKh0+4eNxSKlOGTUmj4eHVb/K3gkbX6bihmWS+9nnN3I4HL+KPZ j88xQCHX07Gh4nECAwEAAaOB0jCBzzAJBgNVHRMEAjAAMEQGA1UdIAQ9MDswOQYLYIZIAYb4 RQEHFwEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYTALBgNV HQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwQGCCsGAQUFBwMCMFAGA1UdHwRJMEcwRaBD oEGGP2h0dHA6Ly9pbmRjMWRpZ2l0YWxpZC1nMy1jcmwudmVyaXNpZ24uY29tL0luZEMxRGln aXRhbElELUczLmNybDANBgkqhkiG9w0BAQUFAAOCAQEAl7oehxokYa9omPurM44GROaRxtIQ acWWpCgeMNDqJXyEgm30u0hY1szXiSyVnkIx/sh4HuBqvXJnZZvLjksEIzdALTgCAskojzeT oeX+340loS87OO82/XUDT5YY3+R5G+4oQIxKVqF7kDmOuJ2opbjU4dFxHhIypiEcWjG2sjWd 127poxMQeY4lCk3qKw94pK5RpVPJK8hzaf+pWoL2D7i3L2xE+DMzZJ1OB3AxcGxhvupUq+zz 3Z9IIHo6DNOwUyCNR+ShVnuCaoJcya35mQzhs1s5+LcP/ysrUzhPo+iYNXGv+q5iNQEXZ7Dw kPgAm17fnxmih6D4KRbmrc3xpjCCBVcwggQ/oAMCAQICEGdLwnOg7SU/xzieX7FaFewwDQYJ KoZIhvcNAQEFBQAwgd0xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEf MB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazE7MDkGA1UECxMyVGVybXMgb2YgdXNl IGF0IGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEgKGMpMDkxHjAcBgNVBAsTFVBlcnNv bmEgTm90IFZhbGlkYXRlZDE3MDUGA1UEAxMuVmVyaVNpZ24gQ2xhc3MgMSBJbmRpdmlkdWFs IFN1YnNjcmliZXIgQ0EgLSBHMzAeFw0xMDEyMDgwMDAwMDBaFw0xMTEyMDgyMzU5NTlaMIIB GjEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5l dHdvcmsxRjBEBgNVBAsTPXd3dy52ZXJpc2lnbi5jb20vcmVwb3NpdG9yeS9SUEEgSW5jb3Jw LiBieSBSZWYuLExJQUIuTFREKGMpOTgxHjAcBgNVBAsTFVBlcnNvbmEgTm90IFZhbGlkYXRl ZDEzMDEGA1UECxMqRGlnaXRhbCBJRCBDbGFzcyAxIC0gTmV0c2NhcGUgRnVsbCBTZXJ2aWNl MRswGQYDVQQDFBJNQVJFSyBNYXJjenlrb3dza2kxJDAiBgkqhkiG9w0BCQEWFW1hcm1hcmVr QG1pbXV3LmVkdS5wbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMGGGDj1KJXX y13nNqo0NP7EJNnzjWHih+Z88UA/c/CZOIu3/SUnA9gly922moQ+r4AM0k6EQaVkAdldSOy1 hO/fTcJQBwDemcnACWstMDMvIbWndkxyxNgh8bQD/xKXx1SyfKTixcx0QZXosY8HnHLWeF0T e5U9J8yUPxigCFJFe6rtY2iARrWcqWXDr4DRQc5J43aohBXGRHw+OakREqLZds6HEE6+YvJH +udcfqlrfkLKHJeiyA4UPtZwBvamEGOKrm2rqyps/JeivaTs6zKh0+4eNxSKlOGTUmj4eHVb /K3gkbX6bihmWS+9nnN3I4HL+KPZj88xQCHX07Gh4nECAwEAAaOB0jCBzzAJBgNVHRMEAjAA MEQGA1UdIAQ9MDswOQYLYIZIAYb4RQEHFwEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cu dmVyaXNpZ24uY29tL3JwYTALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwQGCCsG AQUFBwMCMFAGA1UdHwRJMEcwRaBDoEGGP2h0dHA6Ly9pbmRjMWRpZ2l0YWxpZC1nMy1jcmwu dmVyaXNpZ24uY29tL0luZEMxRGlnaXRhbElELUczLmNybDANBgkqhkiG9w0BAQUFAAOCAQEA l7oehxokYa9omPurM44GROaRxtIQacWWpCgeMNDqJXyEgm30u0hY1szXiSyVnkIx/sh4HuBq vXJnZZvLjksEIzdALTgCAskojzeToeX+340loS87OO82/XUDT5YY3+R5G+4oQIxKVqF7kDmO uJ2opbjU4dFxHhIypiEcWjG2sjWd127poxMQeY4lCk3qKw94pK5RpVPJK8hzaf+pWoL2D7i3 L2xE+DMzZJ1OB3AxcGxhvupUq+zz3Z9IIHo6DNOwUyCNR+ShVnuCaoJcya35mQzhs1s5+LcP /ysrUzhPo+iYNXGv+q5iNQEXZ7DwkPgAm17fnxmih6D4KRbmrc3xpjCCBu4wggXWoAMCAQIC EHEVZgVK5JEhTem8RPms09wwDQYJKoZIhvcNAQEFBQAwgcoxCzAJBgNVBAYTAlVTMRcwFQYD VQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazE6 MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ug b25seTFFMEMGA1UEAxM8VmVyaVNpZ24gQ2xhc3MgMSBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZp Y2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA5MDUwMTAwMDAwMFoXDTE5MDQzMDIzNTk1OVow gd0xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVy aVNpZ24gVHJ1c3QgTmV0d29yazE7MDkGA1UECxMyVGVybXMgb2YgdXNlIGF0IGh0dHBzOi8v d3d3LnZlcmlzaWduLmNvbS9ycGEgKGMpMDkxHjAcBgNVBAsTFVBlcnNvbmEgTm90IFZhbGlk YXRlZDE3MDUGA1UEAxMuVmVyaVNpZ24gQ2xhc3MgMSBJbmRpdmlkdWFsIFN1YnNjcmliZXIg Q0EgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO3ER98qKB18Bmu71yEy yWwTj+mxjUFONPfaC+Nq+mWIIAsRE+mb4ElOi2/VAdBfDUeRilpMdD4/xpEJu0w0no1uoYJR YvdpdliWB6+eFBgHT1q9n9IxslQZc0ZqGUIR7BJzIY313DDN5dlWCjHFNm0pFJe9LdqJRxmI 2EsEPeu2PGcedAATDdCG2pNn+DMDrho8a2l49sAsjuGDP3f5mf/+n1JawrSHCthsqUfBVCll Qz5KwJYfwa33d69ssQRevsG2lC2XkC0n0rse6YNqhPbEsq4jBmUmpSdYKwcitG+mYkgad/LV UCeaKdOW+yj1uiR2YuOMWev7btVCxL5Bx/UCAwEAAaOCArkwggK1MDQGCCsGAQUFBwEBBCgw JjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNpZ24uY29tMBIGA1UdEwEB/wQIMAYB Af8CAQAwcAYDVR0gBGkwZzBlBgtghkgBhvhFAQcXATBWMCgGCCsGAQUFBwIBFhxodHRwczov L3d3dy52ZXJpc2lnbi5jb20vY3BzMCoGCCsGAQUFBwICMB4aHGh0dHBzOi8vd3d3LnZlcmlz aWduLmNvbS9ycGEwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovL2NybC52ZXJpc2lnbi5jb20v cGNhMS1nMy5jcmwwDgYDVR0PAQH/BAQDAgEGMG4GCCsGAQUFBwEMBGIwYKFeoFwwWjBYMFYW CWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4mymsSweLIQUYMCYWJGh0dHA6 Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjAuBgNVHREEJzAlpCMwITEfMB0GA1UE AxMWUHJpdmF0ZUxhYmVsNC0yMDQ4LTExODAdBgNVHQ4EFgQUeUdhCEH9OASiS+e1zPVD9kkr EfgwgfEGA1UdIwSB6TCB5qGB0KSBzTCByjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlT aWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEo YykgMTk5OSBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYD VQQDEzxWZXJpU2lnbiBDbGFzcyAxIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 aG9yaXR5IC0gRzOCEQCLW3VWhFSFCwDPrzhIzrGkMA0GCSqGSIb3DQEBBQUAA4IBAQA5Tc9B mYG1qQW1UjjpOYSJbOQ0qFrn2GwJTCQaulmkhztzIfGTgc+/aGNaZ/41hSuhw12jSsI6Gd0w 1sxN7/HSgZfKVFpDvzeLeo4ZjQ9DqIzyr2CzFYqzlZw84J6zJ5ikNXIX5fwqXYfTig3C0UUq +MD0rCqTOtWuEnAI6/s74nfs6CtkNXbNutrg0csU1nFYm77VPn222egkxSRmTF2RH3azFz5/ DcYhiS+zN7ih/1yybUneZVJC+w6I0u1KHb9L4/jMcvpIDmWOScjW+JmYO7eUPjFxBof6bFlT LtffK+1fYwCsFe0DuFUWjMZoA+ciqHMLsbyg2lJY3QoOf8GCMYIE7DCCBOgCAQEwgfIwgd0x CzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp Z24gVHJ1c3QgTmV0d29yazE7MDkGA1UECxMyVGVybXMgb2YgdXNlIGF0IGh0dHBzOi8vd3d3 LnZlcmlzaWduLmNvbS9ycGEgKGMpMDkxHjAcBgNVBAsTFVBlcnNvbmEgTm90IFZhbGlkYXRl ZDE3MDUGA1UEAxMuVmVyaVNpZ24gQ2xhc3MgMSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0Eg LSBHMwIQZ0vCc6DtJT/HOJ5fsVoV7DAJBgUrDgMCGgUAoIICzjAYBgkqhkiG9w0BCQMxCwYJ KoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xMTA2MDcxMjAwMThaMCMGCSqGSIb3DQEJBDEW BBQj82xYEMBaXl+dkVmTVaWaG0mmCDBfBgkqhkiG9w0BCQ8xUjBQMAsGCWCGSAFlAwQBAjAK BggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYI KoZIhvcNAwICASgwggEDBgkrBgEEAYI3EAQxgfUwgfIwgd0xCzAJBgNVBAYTAlVTMRcwFQYD VQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazE7 MDkGA1UECxMyVGVybXMgb2YgdXNlIGF0IGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEg KGMpMDkxHjAcBgNVBAsTFVBlcnNvbmEgTm90IFZhbGlkYXRlZDE3MDUGA1UEAxMuVmVyaVNp Z24gQ2xhc3MgMSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0EgLSBHMwIQZ0vCc6DtJT/HOJ5f sVoV7DCCAQUGCyqGSIb3DQEJEAILMYH1oIHyMIHdMQswCQYDVQQGEwJVUzEXMBUGA1UEChMO VmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOzA5BgNV BAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA5 MR4wHAYDVQQLExVQZXJzb25hIE5vdCBWYWxpZGF0ZWQxNzA1BgNVBAMTLlZlcmlTaWduIENs YXNzIDEgSW5kaXZpZHVhbCBTdWJzY3JpYmVyIENBIC0gRzMCEGdLwnOg7SU/xzieX7FaFeww DQYJKoZIhvcNAQEBBQAEggEAhIieK/0PbtZ5kE5Dmawhqi/Q1/7u70hZV3JpYuvZdMDF9K6V DsUxnwj1h4ufMJyTaTGuWfVO0PRkdyDAF1Q7yyz23R+/cN3Qcb9PSbmWPlLqHqJhiU84Rmlx 2poQwuNNAFPsmUpmbmi5fhFm7s3qUpsZMx8s9Y+/7t4XkiyogXNCVZuuQ24nSjPh71qmC7G/ Jccr5FTUHRvLL6Sczp0iiCIqu/Q8uOJZMae1SMFjj7PcWNkhPJCBdIdxjJnZkxbDipQ3HF1E OvgOfRJsOxt6kn66rfBVIjcRrIxlEYg9uOoq4OuKHH2mks6DQYz93EZvDlPmmwB5lFfLFPRW dxIfrAAAAAAAAA== --------------ms010204030309080703070200-- --===============0931118657== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --===============0931118657==--