From: Evan Quan Subject: [PATCH 2/2] drm/amdgpu/psp: prevent page fault by checking write_frame address(v3) - Prevent a possible buffer overflow when updating the ring buffer by bounds checking the command frame against the available space in the ring buffer. Date: Fri, 20 Oct 2017 16:38:24 +0800 Message-ID: <1508488704-31904-1-git-send-email-evan.quan@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Alexander.Deucher-5C7GfCeVMHo@public.gmane.org, Evan Quan , rex.zhu-5C7GfCeVMHo@public.gmane.org IHYyOiB1cGRhdGUgdGhlIHJpbmdfYnVmZmVyX2VuZCBhZGRyZXNzCiB2MzogdXBkYXRlIHRoZSBj b21taXQgbG9nCgpDaGFuZ2UtSWQ6IElmM2I3OTQyOGIzMmZmYWI1N2I0ZTc1ZjljMjBjMmIyZDdl NjAwMjIzClNpZ25lZC1vZmYtYnk6IEV2YW4gUXVhbiA8ZXZhbi5xdWFuQGFtZC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvcHNwX3YxMF8wLmMgfCAxNiArKysrKysrKysrKysr Ky0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9wc3BfdjNfMS5jICB8IDE2ICsrKysrKysr KysrKysrLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9wc3BfdjEwXzAuYyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92MTBfMC5jCmluZGV4IGRlYTdjOTAuLjI2 ZTEwYWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92MTBfMC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92MTBfMC5jCkBAIC0yNTcsNiAr MjU3LDkgQEAgaW50IHBzcF92MTBfMF9jbWRfc3VibWl0KHN0cnVjdCBwc3BfY29udGV4dCAqcHNw LAogCXVuc2lnbmVkIGludCBwc3Bfd3JpdGVfcHRyX3JlZyA9IDA7CiAJc3RydWN0IHBzcF9nZnhf cmJfZnJhbWUgKiB3cml0ZV9mcmFtZSA9IHBzcC0+a21fcmluZy5yaW5nX21lbTsKIAlzdHJ1Y3Qg cHNwX3JpbmcgKnJpbmcgPSAmcHNwLT5rbV9yaW5nOworCXN0cnVjdCBwc3BfZ2Z4X3JiX2ZyYW1l ICpyaW5nX2J1ZmZlcl9zdGFydCA9IHJpbmctPnJpbmdfbWVtOworCXN0cnVjdCBwc3BfZ2Z4X3Ji X2ZyYW1lICpyaW5nX2J1ZmZlcl9lbmQgPSByaW5nX2J1ZmZlcl9zdGFydCArCisJCXJpbmctPnJp bmdfc2l6ZSAvIHNpemVvZihzdHJ1Y3QgcHNwX2dmeF9yYl9mcmFtZSkgLSAxOwogCXN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2ID0gcHNwLT5hZGV2OwogCXVpbnQzMl90IHJpbmdfc2l6ZV9kdyA9 IHJpbmctPnJpbmdfc2l6ZSAvIDQ7CiAJdWludDMyX3QgcmJfZnJhbWVfc2l6ZV9kdyA9IHNpemVv ZihzdHJ1Y3QgcHNwX2dmeF9yYl9mcmFtZSkgLyA0OwpAQCAtMjY2LDkgKzI2OSwxOCBAQCBpbnQg cHNwX3YxMF8wX2NtZF9zdWJtaXQoc3RydWN0IHBzcF9jb250ZXh0ICpwc3AsCiAKIAkvKiBVcGRh dGUgS00gUkIgZnJhbWUgcG9pbnRlciB0byBuZXcgZnJhbWUgKi8KIAlpZiAoKHBzcF93cml0ZV9w dHJfcmVnICUgcmluZ19zaXplX2R3KSA9PSAwKQotCQl3cml0ZV9mcmFtZSA9IHJpbmctPnJpbmdf bWVtOworCQl3cml0ZV9mcmFtZSA9IHJpbmdfYnVmZmVyX3N0YXJ0OwogCWVsc2UKLQkJd3JpdGVf ZnJhbWUgPSByaW5nLT5yaW5nX21lbSArIChwc3Bfd3JpdGVfcHRyX3JlZyAvIHJiX2ZyYW1lX3Np emVfZHcpOworCQl3cml0ZV9mcmFtZSA9IHJpbmdfYnVmZmVyX3N0YXJ0ICsgKHBzcF93cml0ZV9w dHJfcmVnIC8gcmJfZnJhbWVfc2l6ZV9kdyk7CisJLyogQ2hlY2sgaW52YWxpZCB3cml0ZV9mcmFt ZSBwdHIgYWRkcmVzcyAqLworCWlmICgod3JpdGVfZnJhbWUgPCByaW5nX2J1ZmZlcl9zdGFydCkg fHwgKHJpbmdfYnVmZmVyX2VuZCA8IHdyaXRlX2ZyYW1lKSkgeworCQlEUk1fRVJST1IoInJpbmdf YnVmZmVyX3N0YXJ0ID0gJXg7IHJpbmdfYnVmZmVyX2VuZCA9ICV4OyB3cml0ZV9mcmFtZSA9ICV4 XG4iLAorCQkJCXJpbmdfYnVmZmVyX3N0YXJ0LAorCQkJCXJpbmdfYnVmZmVyX2VuZCwKKwkJCQl3 cml0ZV9mcmFtZSk7CisJCURSTV9FUlJPUigid3JpdGVfZnJhbWUgaXMgcG9pbnRpbmcgdG8gYWRk cmVzcyBvdXQgb2YgYm91bmRzXG4iKTsKKwkJcmV0dXJuIC1FSU5WQUw7CisJfQogCiAJLyogSW5p dGlhbGl6ZSBLTSBSQiBmcmFtZSAqLwogCW1lbXNldCh3cml0ZV9mcmFtZSwgMCwgc2l6ZW9mKHN0 cnVjdCBwc3BfZ2Z4X3JiX2ZyYW1lKSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9wc3BfdjNfMS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvcHNwX3YzXzEu YwppbmRleCBjZWU1YzM5Li5kMjE3MDUwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9wc3BfdjNfMS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92 M18xLmMKQEAgLTM2Nyw2ICszNjcsOSBAQCBpbnQgcHNwX3YzXzFfY21kX3N1Ym1pdChzdHJ1Y3Qg cHNwX2NvbnRleHQgKnBzcCwKIAl1bnNpZ25lZCBpbnQgcHNwX3dyaXRlX3B0cl9yZWcgPSAwOwog CXN0cnVjdCBwc3BfZ2Z4X3JiX2ZyYW1lICogd3JpdGVfZnJhbWUgPSBwc3AtPmttX3Jpbmcucmlu Z19tZW07CiAJc3RydWN0IHBzcF9yaW5nICpyaW5nID0gJnBzcC0+a21fcmluZzsKKwlzdHJ1Y3Qg cHNwX2dmeF9yYl9mcmFtZSAqcmluZ19idWZmZXJfc3RhcnQgPSByaW5nLT5yaW5nX21lbTsKKwlz dHJ1Y3QgcHNwX2dmeF9yYl9mcmFtZSAqcmluZ19idWZmZXJfZW5kID0gcmluZ19idWZmZXJfc3Rh cnQgKworCQlyaW5nLT5yaW5nX3NpemUgLyBzaXplb2Yoc3RydWN0IHBzcF9nZnhfcmJfZnJhbWUp IC0gMTsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IHBzcC0+YWRldjsKIAl1aW50MzJf dCByaW5nX3NpemVfZHcgPSByaW5nLT5yaW5nX3NpemUgLyA0OwogCXVpbnQzMl90IHJiX2ZyYW1l X3NpemVfZHcgPSBzaXplb2Yoc3RydWN0IHBzcF9nZnhfcmJfZnJhbWUpIC8gNDsKQEAgLTM3OCw5 ICszODEsMTggQEAgaW50IHBzcF92M18xX2NtZF9zdWJtaXQoc3RydWN0IHBzcF9jb250ZXh0ICpw c3AsCiAJLyogd3JpdGVfZnJhbWUgcHRyIGluY3JlbWVudHMgYnkgc2l6ZSBvZiByYl9mcmFtZSBp biBieXRlcyAqLwogCS8qIHBzcF93cml0ZV9wdHJfcmVnIGluY3JlbWVudHMgYnkgc2l6ZSBvZiBy Yl9mcmFtZSBpbiBEV09SRHMgKi8KIAlpZiAoKHBzcF93cml0ZV9wdHJfcmVnICUgcmluZ19zaXpl X2R3KSA9PSAwKQotCQl3cml0ZV9mcmFtZSA9IHJpbmctPnJpbmdfbWVtOworCQl3cml0ZV9mcmFt ZSA9IHJpbmdfYnVmZmVyX3N0YXJ0OwogCWVsc2UKLQkJd3JpdGVfZnJhbWUgPSByaW5nLT5yaW5n X21lbSArIChwc3Bfd3JpdGVfcHRyX3JlZyAvIHJiX2ZyYW1lX3NpemVfZHcpOworCQl3cml0ZV9m cmFtZSA9IHJpbmdfYnVmZmVyX3N0YXJ0ICsgKHBzcF93cml0ZV9wdHJfcmVnIC8gcmJfZnJhbWVf c2l6ZV9kdyk7CisJLyogQ2hlY2sgaW52YWxpZCB3cml0ZV9mcmFtZSBwdHIgYWRkcmVzcyAqLwor CWlmICgod3JpdGVfZnJhbWUgPCByaW5nX2J1ZmZlcl9zdGFydCkgfHwgKHJpbmdfYnVmZmVyX2Vu ZCA8IHdyaXRlX2ZyYW1lKSkgeworCQlEUk1fRVJST1IoInJpbmdfYnVmZmVyX3N0YXJ0ID0gJXg7 IHJpbmdfYnVmZmVyX2VuZCA9ICV4OyB3cml0ZV9mcmFtZSA9ICV4XG4iLAorCQkJCXJpbmdfYnVm ZmVyX3N0YXJ0LAorCQkJCXJpbmdfYnVmZmVyX2VuZCwKKwkJCQl3cml0ZV9mcmFtZSk7CisJCURS TV9FUlJPUigid3JpdGVfZnJhbWUgaXMgcG9pbnRpbmcgdG8gYWRkcmVzcyBvdXQgb2YgYm91bmRz XG4iKTsKKwkJcmV0dXJuIC1FSU5WQUw7CisJfQogCiAJLyogSW5pdGlhbGl6ZSBLTSBSQiBmcmFt ZSAqLwogCW1lbXNldCh3cml0ZV9mcmFtZSwgMCwgc2l6ZW9mKHN0cnVjdCBwc3BfZ2Z4X3JiX2Zy YW1lKSk7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4 Cg==