From: Matthew Auld Subject: [PATCH 2/5] drm/i915: harden allocation paths in allocate_va_range Date: Tue, 12 Apr 2016 16:57:40 +0100 Message-ID: <1460476663-24890-2-git-send-email-matthew.auld@intel.com> References: <1460476663-24890-1-git-send-email-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id D57726E714 for ; Tue, 12 Apr 2016 15:58:05 +0000 (UTC) In-Reply-To: <1460476663-24890-1-git-send-email-matthew.auld@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Rm9yIHRoZSBnZW42L2dlbjhfYWxsb2NhdGVfdmFfcmFuZ2UgZnVuY3Rpb25zIHJlbW92ZSB0aGUg V0FSTl9PTiByYW5nZQpzYW5pdHkgY2hlY2tzIGluIGZhdm91ciBvZiBzaW1wbHkgaGFyZGVuaW5n IHRoZSBhbGxvY2F0aW9uIHBhdGhzLiBUaGlzCmFsc28gZml4ZXMgdGhlIGluY29uc2lzdGVuY3kg aW4gd2hpY2ggd2UgZG9uJ3QgYWx3YXlzIGhhbmRsZSB0aGUKcG90ZW50aWFsIG92ZXJmbG93IGlu IG91ciBjaGVja3MuCgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+ClNp Z25lZC1vZmYtYnk6IE1hdHRoZXcgQXVsZCA8bWF0dGhldy5hdWxkQGludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDE3ICsrKystLS0tLS0tLS0tLS0t CiAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDVlZDcxM2QuLmZhNTgzZDUgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0xMjIwLDE1ICsxMjIwLDYgQEAgc3RhdGljIGlu dCBnZW44X2FsbG9jX3ZhX3JhbmdlXzNsdmwoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0s CiAJdWludDMyX3QgcGRwZXMgPSBJOTE1X1BEUEVTX1BFUl9QRFAoZGV2KTsKIAlpbnQgcmV0Owog Ci0JLyogV3JhcCBpcyBuZXZlciBva2F5IHNpbmNlIHdlIGNhbiBvbmx5IHJlcHJlc2VudCA0OGIs IGFuZCB3ZSBkb24ndAotCSAqIGFjdHVhbGx5IHVzZSB0aGUgb3RoZXIgc2lkZSBvZiB0aGUgY2Fu b25pY2FsIGFkZHJlc3Mgc3BhY2UuCi0JICovCi0JaWYgKFdBUk5fT04oc3RhcnQgKyBsZW5ndGgg PCBzdGFydCkpCi0JCXJldHVybiAtRU5PREVWOwotCi0JaWYgKFdBUk5fT04oc3RhcnQgKyBsZW5n dGggPiB2bS0+dG90YWwpKQotCQlyZXR1cm4gLUVOT0RFVjsKLQogCXJldCA9IGFsbG9jX2dlbjhf dGVtcF9iaXRtYXBzKCZuZXdfcGFnZV9kaXJzLCAmbmV3X3BhZ2VfdGFibGVzLCBwZHBlcyk7CiAJ aWYgKHJldCkKIAkJcmV0dXJuIHJldDsKQEAgLTEzNzAsNiArMTM2MSw4IEBAIHN0YXRpYyBpbnQg Z2VuOF9hbGxvY192YV9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIHsKIAlz dHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPSBpOTE1X3ZtX3RvX3BwZ3R0KHZtKTsKIAorCWxl bmd0aCA9IG1pbl90KHVpbnQ2NF90LCBsZW5ndGgsIHZtLT50b3RhbCk7CisKIAlpZiAoVVNFU19G VUxMXzQ4QklUX1BQR1RUKHZtLT5kZXYpKQogCQlyZXR1cm4gZ2VuOF9hbGxvY192YV9yYW5nZV80 bHZsKHZtLCAmcHBndHQtPnBtbDQsIHN0YXJ0LCBsZW5ndGgpOwogCWVsc2UKQEAgLTE4NjAsMTEg KzE4NTMsOSBAQCBzdGF0aWMgaW50IGdlbjZfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRk cmVzc19zcGFjZSAqdm0sCiAJdWludDMyX3QgcGRlLCB0ZW1wOwogCWludCByZXQ7CiAKLQlpZiAo V0FSTl9PTihzdGFydF9pbiArIGxlbmd0aF9pbiA+IHBwZ3R0LT5iYXNlLnRvdGFsKSkKLQkJcmV0 dXJuIC1FTk9ERVY7Ci0KIAlzdGFydCA9IHN0YXJ0X3NhdmUgPSBzdGFydF9pbjsKLQlsZW5ndGgg PSBsZW5ndGhfc2F2ZSA9IGxlbmd0aF9pbjsKKwlsZW5ndGggPSBsZW5ndGhfc2F2ZSA9IGxlbmd0 aF9pbiA9IG1pbl90KHVpbnQ2NF90LCBsZW5ndGhfaW4sCisJCQkJCQkgcHBndHQtPmJhc2UudG90 YWwpOwogCiAJYml0bWFwX3plcm8obmV3X3BhZ2VfdGFibGVzLCBJOTE1X1BERVMpOwogCi0tIAoy LjQuMTEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=