From: Roger Pau Monne Subject: [PATCH v2 2/4] xen-blkback: fix memory leaks Date: Tue, 4 Feb 2014 11:26:13 +0100 Message-ID: <1391509575-3949-3-git-send-email-roger.pau@citrix.com> References: <1391509575-3949-1-git-send-email-roger.pau@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WAdD8-0004Xg-OM for xen-devel@lists.xenproject.org; Tue, 04 Feb 2014 10:26:34 +0000 In-Reply-To: <1391509575-3949-1-git-send-email-roger.pau@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org Cc: Ian Campbell , Matt Rushton , David Vrabel , Matt Wilson , Boris Ostrovsky , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org SSd2ZSBhdCBsZWFzdCBpZGVudGlmaWVkIHR3byBwb3NzaWJsZSBtZW1vcnkgbGVha3MgaW4gYmxr YmFjaywgYm90aApyZWxhdGVkIHRvIHRoZSBzaHV0ZG93biBwYXRoIG9mIGEgVkJEOgoKLSBibGti YWNrIGRvZXNuJ3Qgd2FpdCBmb3IgYW55IHBlbmRpbmcgcHVyZ2Ugd29yayB0byBmaW5pc2ggYmVm b3JlCiAgY2xlYW5pbmcgdGhlIGxpc3Qgb2YgZnJlZV9wYWdlcy4gVGhlIHB1cmdlIHdvcmsgd2ls bCBjYWxsCiAgcHV0X2ZyZWVfcGFnZXMgYW5kIHRodXMgd2UgbWlnaHQgZW5kIHVwIHdpdGggcGFn ZXMgYmVpbmcgYWRkZWQgdG8KICB0aGUgZnJlZV9wYWdlcyBsaXN0IGFmdGVyIHdlIGhhdmUgZW1w dGllZCBpdC4gRml4IHRoaXMgYnkgbWFraW5nCiAgc3VyZSB0aGVyZSdzIG5vIHBlbmRpbmcgcHVy Z2Ugd29yayBiZWZvcmUgZXhpdGluZwogIHhlbl9ibGtpZl9zY2hlZHVsZSwgYW5kIG1vdmluZyB0 aGUgZnJlZV9wYWdlIGNsZWFudXAgY29kZSB0bwogIHhlbl9ibGtpZl9mcmVlLgotIGJsa2JhY2sg ZG9lc24ndCB3YWl0IGZvciBwZW5kaW5nIHJlcXVlc3RzIHRvIGVuZCBiZWZvcmUgY2xlYW5pbmcK ICBwZXJzaXN0ZW50IGdyYW50cyBhbmQgdGhlIGxpc3Qgb2YgZnJlZV9wYWdlcy4gQWdhaW4gdGhp cyBjYW4gYWRkCiAgcGFnZXMgdG8gdGhlIGZyZWVfcGFnZXMgbGlzdCBvciBwZXJzaXN0ZW50IGdy YW50cyB0byB0aGUKICBwZXJzaXN0ZW50X2dudHMgcmVkLWJsYWNrIHRyZWUuIEZpeGVkIGJ5IG1v dmluZyB0aGUgcGVyc2lzdGVudAogIGdyYW50cyBhbmQgZnJlZV9wYWdlcyBjbGVhbnVwIGNvZGUg dG8geGVuX2Jsa2lmX2ZyZWUuCgpBbHNvLCBhZGQgc29tZSBjaGVja3MgaW4geGVuX2Jsa2lmX2Zy ZWUgdG8gbWFrZSBzdXJlIHdlIGFyZSBjbGVhbmluZwpldmVyeXRoaW5nLgoKU2lnbmVkLW9mZi1i eTogUm9nZXIgUGF1IE1vbm7DqSA8cm9nZXIucGF1QGNpdHJpeC5jb20+CkNjOiBLb25yYWQgUnpl c3p1dGVrIFdpbGsgPGtvbnJhZC53aWxrQG9yYWNsZS5jb20+CkNjOiBEYXZpZCBWcmFiZWwgPGRh dmlkLnZyYWJlbEBjaXRyaXguY29tPgpDYzogQm9yaXMgT3N0cm92c2t5IDxib3Jpcy5vc3Ryb3Zz a3lAb3JhY2xlLmNvbT4KQ2M6IE1hdHQgUnVzaHRvbiA8bXJ1c2h0b25AYW1hem9uLmNvbT4KQ2M6 IE1hdHQgV2lsc29uIDxtc3dAYW1hem9uLmNvbT4KQ2M6IElhbiBDYW1wYmVsbCA8SWFuLkNhbXBi ZWxsQGNpdHJpeC5jb20+Ci0tLQogZHJpdmVycy9ibG9jay94ZW4tYmxrYmFjay9ibGtiYWNrLmMg fCAgIDI3ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLQogZHJpdmVycy9ibG9jay94ZW4tYmxr YmFjay9jb21tb24uaCAgfCAgICAxICsKIGRyaXZlcnMvYmxvY2sveGVuLWJsa2JhY2sveGVuYnVz LmMgIHwgICAxMiArKysrKysrKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgMzEgaW5zZXJ0aW9ucygr KSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2Jsb2NrL3hlbi1ibGtiYWNr L2Jsa2JhY2suYyBiL2RyaXZlcnMvYmxvY2sveGVuLWJsa2JhY2svYmxrYmFjay5jCmluZGV4IDMw ZWY3YjMuLmRjZmU0OWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvYmxvY2sveGVuLWJsa2JhY2svYmxr YmFjay5jCisrKyBiL2RyaXZlcnMvYmxvY2sveGVuLWJsa2JhY2svYmxrYmFjay5jCkBAIC0zNzUs NyArMzc1LDcgQEAgc3RhdGljIHZvaWQgcHVyZ2VfcGVyc2lzdGVudF9nbnQoc3RydWN0IHhlbl9i bGtpZiAqYmxraWYpCiAKIAlwcl9kZWJ1ZyhEUlZfUEZYICJHb2luZyB0byBwdXJnZSAldSBwZXJz aXN0ZW50IGdyYW50c1xuIiwgbnVtX2NsZWFuKTsKIAotCUlOSVRfTElTVF9IRUFEKCZibGtpZi0+ cGVyc2lzdGVudF9wdXJnZV9saXN0KTsKKwlCVUdfT04oIWxpc3RfZW1wdHkoJmJsa2lmLT5wZXJz aXN0ZW50X3B1cmdlX2xpc3QpKTsKIAlyb290ID0gJmJsa2lmLT5wZXJzaXN0ZW50X2dudHM7CiBw dXJnZV9saXN0OgogCWZvcmVhY2hfZ3JhbnRfc2FmZShwZXJzaXN0ZW50X2dudCwgbiwgcm9vdCwg bm9kZSkgewpAQCAtNjI1LDYgKzYyNSwyMyBAQCBwdXJnZV9nbnRfbGlzdDoKIAkJCXByaW50X3N0 YXRzKGJsa2lmKTsKIAl9CiAKKwkvKiBEcmFpbiBwZW5kaW5nIHB1cmdlIHdvcmsgKi8KKwlmbHVz aF93b3JrKCZibGtpZi0+cGVyc2lzdGVudF9wdXJnZV93b3JrKTsKKworCWlmIChsb2dfc3RhdHMp CisJCXByaW50X3N0YXRzKGJsa2lmKTsKKworCWJsa2lmLT54ZW5ibGtkID0gTlVMTDsKKwl4ZW5f YmxraWZfcHV0KGJsa2lmKTsKKworCXJldHVybiAwOworfQorCisvKgorICogUmVtb3ZlIHBlcnNp c3RlbnQgZ3JhbnRzIGFuZCBlbXB0eSB0aGUgcG9vbCBvZiBmcmVlIHBhZ2VzCisgKi8KK3ZvaWQg eGVuX2Jsa2JrX2ZyZWVfY2FjaGVzKHN0cnVjdCB4ZW5fYmxraWYgKmJsa2lmKQorewogCS8qIEZy ZWUgYWxsIHBlcnNpc3RlbnQgZ3JhbnQgcGFnZXMgKi8KIAlpZiAoIVJCX0VNUFRZX1JPT1QoJmJs a2lmLT5wZXJzaXN0ZW50X2dudHMpKQogCQlmcmVlX3BlcnNpc3RlbnRfZ250cyhibGtpZiwgJmJs a2lmLT5wZXJzaXN0ZW50X2dudHMsCkBAIC02MzUsMTQgKzY1Miw2IEBAIHB1cmdlX2dudF9saXN0 OgogCiAJLyogU2luY2Ugd2UgYXJlIHNodXR0aW5nIGRvd24gcmVtb3ZlIGFsbCBwYWdlcyBmcm9t IHRoZSBidWZmZXIgKi8KIAlzaHJpbmtfZnJlZV9wYWdlcG9vbChibGtpZiwgMCAvKiBBbGwgKi8p OwotCi0JaWYgKGxvZ19zdGF0cykKLQkJcHJpbnRfc3RhdHMoYmxraWYpOwotCi0JYmxraWYtPnhl bmJsa2QgPSBOVUxMOwotCXhlbl9ibGtpZl9wdXQoYmxraWYpOwotCi0JcmV0dXJuIDA7CiB9CiAK IC8qCmRpZmYgLS1naXQgYS9kcml2ZXJzL2Jsb2NrL3hlbi1ibGtiYWNrL2NvbW1vbi5oIGIvZHJp dmVycy9ibG9jay94ZW4tYmxrYmFjay9jb21tb24uaAppbmRleCA4ZDg4MDc1Li5mNzMzZDc2IDEw MDY0NAotLS0gYS9kcml2ZXJzL2Jsb2NrL3hlbi1ibGtiYWNrL2NvbW1vbi5oCisrKyBiL2RyaXZl cnMvYmxvY2sveGVuLWJsa2JhY2svY29tbW9uLmgKQEAgLTM3Niw2ICszNzYsNyBAQCBpbnQgeGVu X2Jsa2lmX3hlbmJ1c19pbml0KHZvaWQpOwogaXJxcmV0dXJuX3QgeGVuX2Jsa2lmX2JlX2ludChp bnQgaXJxLCB2b2lkICpkZXZfaWQpOwogaW50IHhlbl9ibGtpZl9zY2hlZHVsZSh2b2lkICphcmcp OwogaW50IHhlbl9ibGtpZl9wdXJnZV9wZXJzaXN0ZW50KHZvaWQgKmFyZyk7Cit2b2lkIHhlbl9i bGtia19mcmVlX2NhY2hlcyhzdHJ1Y3QgeGVuX2Jsa2lmICpibGtpZik7CiAKIGludCB4ZW5fYmxr YmtfZmx1c2hfZGlza2NhY2hlKHN0cnVjdCB4ZW5idXNfdHJhbnNhY3Rpb24geGJ0LAogCQkJICAg ICAgc3RydWN0IGJhY2tlbmRfaW5mbyAqYmUsIGludCBzdGF0ZSk7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2Jsb2NrL3hlbi1ibGtiYWNrL3hlbmJ1cy5jIGIvZHJpdmVycy9ibG9jay94ZW4tYmxrYmFj ay94ZW5idXMuYwppbmRleCBjMjAxNGEwLi44YWZlZjY3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2Js b2NrL3hlbi1ibGtiYWNrL3hlbmJ1cy5jCisrKyBiL2RyaXZlcnMvYmxvY2sveGVuLWJsa2JhY2sv eGVuYnVzLmMKQEAgLTEyNSw2ICsxMjUsNyBAQCBzdGF0aWMgc3RydWN0IHhlbl9ibGtpZiAqeGVu X2Jsa2lmX2FsbG9jKGRvbWlkX3QgZG9taWQpCiAJYmxraWYtPnBlcnNpc3RlbnRfZ250cy5yYl9u b2RlID0gTlVMTDsKIAlzcGluX2xvY2tfaW5pdCgmYmxraWYtPmZyZWVfcGFnZXNfbG9jayk7CiAJ SU5JVF9MSVNUX0hFQUQoJmJsa2lmLT5mcmVlX3BhZ2VzKTsKKwlJTklUX0xJU1RfSEVBRCgmYmxr aWYtPnBlcnNpc3RlbnRfcHVyZ2VfbGlzdCk7CiAJYmxraWYtPmZyZWVfcGFnZXNfbnVtID0gMDsK IAlhdG9taWNfc2V0KCZibGtpZi0+cGVyc2lzdGVudF9nbnRfaW5fdXNlLCAwKTsKIApAQCAtMjU5 LDYgKzI2MCwxNyBAQCBzdGF0aWMgdm9pZCB4ZW5fYmxraWZfZnJlZShzdHJ1Y3QgeGVuX2Jsa2lm ICpibGtpZikKIAlpZiAoIWF0b21pY19kZWNfYW5kX3Rlc3QoJmJsa2lmLT5yZWZjbnQpKQogCQlC VUcoKTsKIAorCS8qIFJlbW92ZSBhbGwgcGVyc2lzdGVudCBncmFudHMgYW5kIHRoZSBjYWNoZSBv ZiBiYWxsb29uZWQgcGFnZXMuICovCisJeGVuX2Jsa2JrX2ZyZWVfY2FjaGVzKGJsa2lmKTsKKwor CS8qIE1ha2Ugc3VyZSBldmVyeXRoaW5nIGlzIGRyYWluZWQgYmVmb3JlIHNodXR0aW5nIGRvd24g Ki8KKwlCVUdfT04oYmxraWYtPnBlcnNpc3RlbnRfZ250X2MgIT0gMCk7CisJQlVHX09OKGF0b21p Y19yZWFkKCZibGtpZi0+cGVyc2lzdGVudF9nbnRfaW5fdXNlKSAhPSAwKTsKKwlCVUdfT04oYmxr aWYtPmZyZWVfcGFnZXNfbnVtICE9IDApOworCUJVR19PTighbGlzdF9lbXB0eSgmYmxraWYtPnBl cnNpc3RlbnRfcHVyZ2VfbGlzdCkpOworCUJVR19PTighbGlzdF9lbXB0eSgmYmxraWYtPmZyZWVf cGFnZXMpKTsKKwlCVUdfT04oIVJCX0VNUFRZX1JPT1QoJmJsa2lmLT5wZXJzaXN0ZW50X2dudHMp KTsKKwogCS8qIENoZWNrIHRoYXQgdGhlcmUgaXMgbm8gcmVxdWVzdCBpbiB1c2UgKi8KIAlsaXN0 X2Zvcl9lYWNoX2VudHJ5X3NhZmUocmVxLCBuLCAmYmxraWYtPnBlbmRpbmdfZnJlZSwgZnJlZV9s aXN0KSB7CiAJCWxpc3RfZGVsKCZyZXEtPmZyZWVfbGlzdCk7Ci0tIAoxLjcuNy41IChBcHBsZSBH aXQtMjYpCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K WGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwOi8vbGlz dHMueGVuLm9yZy94ZW4tZGV2ZWwK