From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jarkko Sakkinen Subject: Re: [PATCH] drm: remove redundant code form drm_ioc32.c Date: Fri, 03 Jul 2015 14:03:23 +0300 Message-ID: <55966BFB.8060308@linux.intel.com> References: <1435742677-14158-1-git-send-email-jarkko.sakkinen@linux.intel.com> <87lhezugip.fsf@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 1C2B66E30C for ; Fri, 3 Jul 2015 04:03:26 -0700 (PDT) In-Reply-To: <87lhezugip.fsf@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Jani Nikula , airlied@linux.ie, dri-devel@lists.freedesktop.org Cc: open list List-Id: dri-devel@lists.freedesktop.org CgpPbiAwNy8wMi8yMDE1IDExOjEwIEFNLCBKYW5pIE5pa3VsYSB3cm90ZToKPiBPbiBXZWQsIDAx IEp1bCAyMDE1LCBKYXJra28gU2Fra2luZW4gPGphcmtrby5zYWtraW5lbkBsaW51eC5pbnRlbC5j b20+IHdyb3RlOgo+PiBUaGUgY29tcGF0IGlvY3RsIGhhbmRsZXIgZW5kcyB1cCBjYWxsaW5nIGFj Y2Vzc19vaygpIHR3aWNlOiBmaXJzdAo+PiBpbmRpcmVjdGx5IGluc2lkZSBjb21wYXRfYWxsb2Nf dXNlcl9zcGFjZSgpIGFuZCB0aGVuIGFmdGVyIHJldHVybmluZwo+PiBmcm9tIHRoYXQgZnVuY3Rp b24uIFRoaXMgcGF0Y2ggZml4ZXMgaXNzdWUuCj4+Cj4+IFNpZ25lZC1vZmYtYnk6IEphcmtrbyBT YWtraW5lbiA8amFya2tvLnNha2tpbmVuQGxpbnV4LmludGVsLmNvbT4KPj4gLS0tCj4+ICAgZHJp dmVycy9ncHUvZHJtL2RybV9pb2MzMi5jIHwgNTUgKysrKysrKysrKysrKysrKysrKysrLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCj4+ICAgMSBmaWxlIGNoYW5nZWQsIDI2IGluc2VydGlvbnMoKyks IDI5IGRlbGV0aW9ucygtKQo+Pgo+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9p b2MzMi5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9pb2MzMi5jCj4+IGluZGV4IGFhOGJiYjQuLjc3 YjYzZTcgMTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1faW9jMzIuYwo+PiArKysg Yi9kcml2ZXJzL2dwdS9kcm0vZHJtX2lvYzMyLmMKPj4gQEAgLTkzLDcgKzkzLDcgQEAgc3RhdGlj IGludCBjb21wYXRfZHJtX3ZlcnNpb24oc3RydWN0IGZpbGUgKmZpbGUsIHVuc2lnbmVkIGludCBj bWQsCj4+ICAgCQlyZXR1cm4gLUVGQVVMVDsKPj4gICAKPj4gICAJdmVyc2lvbiA9IGNvbXBhdF9h bGxvY191c2VyX3NwYWNlKHNpemVvZigqdmVyc2lvbikpOwo+PiAtCWlmICghYWNjZXNzX29rKFZF UklGWV9XUklURSwgdmVyc2lvbiwgc2l6ZW9mKCp2ZXJzaW9uKSkpCj4+ICsJaWYgKCF2ZXJzaW9u KQo+PiAgIAkJcmV0dXJuIC1FRkFVTFQ7Cj4+ICAgCWlmIChfX3B1dF91c2VyKHYzMi5uYW1lX2xl biwgJnZlcnNpb24tPm5hbWVfbGVuKQo+PiAgIAkgICAgfHwgX19wdXRfdXNlcigodm9pZCBfX3Vz ZXIgKikodW5zaWduZWQgbG9uZyl2MzIubmFtZSwKPj4gQEAgLTE0MCw3ICsxNDAsNyBAQCBzdGF0 aWMgaW50IGNvbXBhdF9kcm1fZ2V0dW5pcXVlKHN0cnVjdCBmaWxlICpmaWxlLCB1bnNpZ25lZCBp bnQgY21kLAo+PiAgIAkJcmV0dXJuIC1FRkFVTFQ7Cj4+ICAgCj4+ICAgCXUgPSBjb21wYXRfYWxs b2NfdXNlcl9zcGFjZShzaXplb2YoKnUpKTsKPj4gLQlpZiAoIWFjY2Vzc19vayhWRVJJRllfV1JJ VEUsIHUsIHNpemVvZigqdSkpKQo+PiArCWlmICghdSkKPj4gICAJCXJldHVybiAtRUZBVUxUOwo+ PiAgIAlpZiAoX19wdXRfdXNlcih1cTMyLnVuaXF1ZV9sZW4sICZ1LT51bmlxdWVfbGVuKQo+PiAg IAkgICAgfHwgX19wdXRfdXNlcigodm9pZCBfX3VzZXIgKikodW5zaWduZWQgbG9uZyl1cTMyLnVu aXF1ZSwKPj4gQEAgLTE2OCw3ICsxNjgsNyBAQCBzdGF0aWMgaW50IGNvbXBhdF9kcm1fc2V0dW5p cXVlKHN0cnVjdCBmaWxlICpmaWxlLCB1bnNpZ25lZCBpbnQgY21kLAo+PiAgIAkJcmV0dXJuIC1F RkFVTFQ7Cj4+ICAgCj4+ICAgCXUgPSBjb21wYXRfYWxsb2NfdXNlcl9zcGFjZShzaXplb2YoKnUp KTsKPj4gLQlpZiAoIWFjY2Vzc19vayhWRVJJRllfV1JJVEUsIHUsIHNpemVvZigqdSkpKQo+PiAr CWlmICghdSkKPj4gICAJCXJldHVybiAtRUZBVUxUOwo+PiAgIAlpZiAoX19wdXRfdXNlcih1cTMy LnVuaXF1ZV9sZW4sICZ1LT51bmlxdWVfbGVuKQo+PiAgIAkgICAgfHwgX19wdXRfdXNlcigodm9p ZCBfX3VzZXIgKikodW5zaWduZWQgbG9uZyl1cTMyLnVuaXF1ZSwKPj4gQEAgLTIwMCw3ICsyMDAs NyBAQCBzdGF0aWMgaW50IGNvbXBhdF9kcm1fZ2V0bWFwKHN0cnVjdCBmaWxlICpmaWxlLCB1bnNp Z25lZCBpbnQgY21kLAo+PiAgIAkJcmV0dXJuIC1FRkFVTFQ7Cj4+ICAgCj4+ICAgCW1hcCA9IGNv bXBhdF9hbGxvY191c2VyX3NwYWNlKHNpemVvZigqbWFwKSk7Cj4+IC0JaWYgKCFhY2Nlc3Nfb2so VkVSSUZZX1dSSVRFLCBtYXAsIHNpemVvZigqbWFwKSkpCj4+ICsJaWYgKCFtYXApCj4+ICAgCQly ZXR1cm4gLUVGQVVMVDsKPj4gICAJaWYgKF9fcHV0X3VzZXIoaWR4LCAmbWFwLT5vZmZzZXQpKQo+ PiAgIAkJcmV0dXJuIC1FRkFVTFQ7Cj4+IEBAIC0yMzcsNyArMjM3LDcgQEAgc3RhdGljIGludCBj b21wYXRfZHJtX2FkZG1hcChzdHJ1Y3QgZmlsZSAqZmlsZSwgdW5zaWduZWQgaW50IGNtZCwKPj4g ICAJCXJldHVybiAtRUZBVUxUOwo+PiAgIAo+PiAgIAltYXAgPSBjb21wYXRfYWxsb2NfdXNlcl9z cGFjZShzaXplb2YoKm1hcCkpOwo+PiAtCWlmICghYWNjZXNzX29rKFZFUklGWV9XUklURSwgbWFw LCBzaXplb2YoKm1hcCkpKQo+PiArCWlmICghbWFwKQo+PiAgIAkJcmV0dXJuIC1FRkFVTFQ7Cj4+ ICAgCWlmIChfX3B1dF91c2VyKG0zMi5vZmZzZXQsICZtYXAtPm9mZnNldCkKPj4gICAJICAgIHx8 IF9fcHV0X3VzZXIobTMyLnNpemUsICZtYXAtPnNpemUpCj4+IEBAIC0yNzcsNyArMjc3LDcgQEAg c3RhdGljIGludCBjb21wYXRfZHJtX3JtbWFwKHN0cnVjdCBmaWxlICpmaWxlLCB1bnNpZ25lZCBp bnQgY21kLAo+PiAgIAkJcmV0dXJuIC1FRkFVTFQ7Cj4+ICAgCj4+ICAgCW1hcCA9IGNvbXBhdF9h bGxvY191c2VyX3NwYWNlKHNpemVvZigqbWFwKSk7Cj4+IC0JaWYgKCFhY2Nlc3Nfb2soVkVSSUZZ X1dSSVRFLCBtYXAsIHNpemVvZigqbWFwKSkpCj4+ICsJaWYgKCFtYXApCj4+ICAgCQlyZXR1cm4g LUVGQVVMVDsKPj4gICAJaWYgKF9fcHV0X3VzZXIoKHZvaWQgKikodW5zaWduZWQgbG9uZyloYW5k bGUsICZtYXAtPmhhbmRsZSkpCj4+ICAgCQlyZXR1cm4gLUVGQVVMVDsKPj4gQEAgLTMwNiw3ICsz MDYsNyBAQCBzdGF0aWMgaW50IGNvbXBhdF9kcm1fZ2V0Y2xpZW50KHN0cnVjdCBmaWxlICpmaWxl LCB1bnNpZ25lZCBpbnQgY21kLAo+PiAgIAkJcmV0dXJuIC1FRkFVTFQ7Cj4+ICAgCj4+ICAgCWNs aWVudCA9IGNvbXBhdF9hbGxvY191c2VyX3NwYWNlKHNpemVvZigqY2xpZW50KSk7Cj4+IC0JaWYg KCFhY2Nlc3Nfb2soVkVSSUZZX1dSSVRFLCBjbGllbnQsIHNpemVvZigqY2xpZW50KSkpCj4+ICsJ aWYgKCFjbGllbnQpCj4+ICAgCQlyZXR1cm4gLUVGQVVMVDsKPj4gICAJaWYgKF9fcHV0X3VzZXIo aWR4LCAmY2xpZW50LT5pZHgpKQo+PiAgIAkJcmV0dXJuIC1FRkFVTFQ7Cj4+IEBAIC0zNDUsNyAr MzQ1LDcgQEAgc3RhdGljIGludCBjb21wYXRfZHJtX2dldHN0YXRzKHN0cnVjdCBmaWxlICpmaWxl LCB1bnNpZ25lZCBpbnQgY21kLAo+PiAgIAlpbnQgaSwgZXJyOwo+PiAgIAo+PiAgIAlzdGF0cyA9 IGNvbXBhdF9hbGxvY191c2VyX3NwYWNlKHNpemVvZigqc3RhdHMpKTsKPj4gLQlpZiAoIWFjY2Vz c19vayhWRVJJRllfV1JJVEUsIHN0YXRzLCBzaXplb2YoKnN0YXRzKSkpCj4+ICsJaWYgKCFzdGF0 cykKPj4gICAJCXJldHVybiAtRUZBVUxUOwo+PiAgIAo+PiAgIAllcnIgPSBkcm1faW9jdGwoZmls ZSwgRFJNX0lPQ1RMX0dFVF9TVEFUUywgKHVuc2lnbmVkIGxvbmcpc3RhdHMpOwo+PiBAQCAtMzgy LDggKzM4Miw3IEBAIHN0YXRpYyBpbnQgY29tcGF0X2RybV9hZGRidWZzKHN0cnVjdCBmaWxlICpm aWxlLCB1bnNpZ25lZCBpbnQgY21kLAo+PiAgIAl1bnNpZ25lZCBsb25nIGFncF9zdGFydDsKPj4g ICAKPj4gICAJYnVmID0gY29tcGF0X2FsbG9jX3VzZXJfc3BhY2Uoc2l6ZW9mKCpidWYpKTsKPj4g LQlpZiAoIWFjY2Vzc19vayhWRVJJRllfV1JJVEUsIGJ1Ziwgc2l6ZW9mKCpidWYpKQo+PiAtCSAg ICB8fCAhYWNjZXNzX29rKFZFUklGWV9XUklURSwgYXJncCwgc2l6ZW9mKCphcmdwKSkpCj4+ICsJ aWYgKCFidWYgfHwgIWFyZ3ApCj4gVGhlIHJpc2tzIG9mIHRvdWNoaW5nIG9sZCBjb2RlLi4uIHdo byBkb2VzIGFjY2Vzc19vayBvbiBhcmdwIG5vdz8gVGhhdAo+IGRvZXNuJ3QgY29tZSBmcm9tIGNv bXBhdF9hbGxvY191c2VyX3NwYWNlLgo+Cj4gU2FtZSBwYXR0ZXJuIHJlcGVhdGVkIGJlbG93IGEg ZmV3IHRpbWVzLgpSaWdodC4gVGhhbmtzIGFuZCBzb3JyeSBhYm91dCBzbG9wcGluZXNzLiBJJ2xs IHVwZGF0ZSB0aGUgcGF0Y2guCgo+Cj4gQlIsCj4gSmFuaS4KPgo+Cj4+ICAgCQlyZXR1cm4gLUVG QVVMVDsKPj4gICAKPj4gICAJaWYgKF9fY29weV9pbl91c2VyKGJ1ZiwgYXJncCwgb2Zmc2V0b2Yo ZHJtX2J1Zl9kZXNjMzJfdCwgYWdwX3N0YXJ0KSkKPj4gQEAgLTQxNCw3ICs0MTMsNyBAQCBzdGF0 aWMgaW50IGNvbXBhdF9kcm1fbWFya2J1ZnMoc3RydWN0IGZpbGUgKmZpbGUsIHVuc2lnbmVkIGlu dCBjbWQsCj4+ICAgCQlyZXR1cm4gLUVGQVVMVDsKPj4gICAKPj4gICAJYnVmID0gY29tcGF0X2Fs bG9jX3VzZXJfc3BhY2Uoc2l6ZW9mKCpidWYpKTsKPj4gLQlpZiAoIWFjY2Vzc19vayhWRVJJRllf V1JJVEUsIGJ1Ziwgc2l6ZW9mKCpidWYpKSkKPj4gKwlpZiAoIWJ1ZikKPj4gICAJCXJldHVybiAt RUZBVUxUOwo+PiAgIAo+PiAgIAlpZiAoX19wdXRfdXNlcihiMzIuc2l6ZSwgJmJ1Zi0+c2l6ZSkK Pj4gQEAgLTQ1NSw3ICs0NTQsNyBAQCBzdGF0aWMgaW50IGNvbXBhdF9kcm1faW5mb2J1ZnMoc3Ry dWN0IGZpbGUgKmZpbGUsIHVuc2lnbmVkIGludCBjbWQsCj4+ICAgCj4+ICAgCW5ieXRlcyA9IHNp emVvZigqcmVxdWVzdCkgKyBjb3VudCAqIHNpemVvZihzdHJ1Y3QgZHJtX2J1Zl9kZXNjKTsKPj4g ICAJcmVxdWVzdCA9IGNvbXBhdF9hbGxvY191c2VyX3NwYWNlKG5ieXRlcyk7Cj4+IC0JaWYgKCFh Y2Nlc3Nfb2soVkVSSUZZX1dSSVRFLCByZXF1ZXN0LCBuYnl0ZXMpKQo+PiArCWlmICghcmVxdWVz dCkKPj4gICAJCXJldHVybiAtRUZBVUxUOwo+PiAgIAlsaXN0ID0gKHN0cnVjdCBkcm1fYnVmX2Rl c2MgKikgKHJlcXVlc3QgKyAxKTsKPj4gICAKPj4gQEAgLTUxNiw3ICs1MTUsNyBAQCBzdGF0aWMg aW50IGNvbXBhdF9kcm1fbWFwYnVmcyhzdHJ1Y3QgZmlsZSAqZmlsZSwgdW5zaWduZWQgaW50IGNt ZCwKPj4gICAJCXJldHVybiAtRUlOVkFMOwo+PiAgIAluYnl0ZXMgPSBzaXplb2YoKnJlcXVlc3Qp ICsgY291bnQgKiBzaXplb2Yoc3RydWN0IGRybV9idWZfcHViKTsKPj4gICAJcmVxdWVzdCA9IGNv bXBhdF9hbGxvY191c2VyX3NwYWNlKG5ieXRlcyk7Cj4+IC0JaWYgKCFhY2Nlc3Nfb2soVkVSSUZZ X1dSSVRFLCByZXF1ZXN0LCBuYnl0ZXMpKQo+PiArCWlmICghcmVxdWVzdCkKPj4gICAJCXJldHVy biAtRUZBVUxUOwo+PiAgIAlsaXN0ID0gKHN0cnVjdCBkcm1fYnVmX3B1YiAqKSAocmVxdWVzdCAr IDEpOwo+PiAgIAo+PiBAQCAtNTYzLDcgKzU2Miw3IEBAIHN0YXRpYyBpbnQgY29tcGF0X2RybV9m cmVlYnVmcyhzdHJ1Y3QgZmlsZSAqZmlsZSwgdW5zaWduZWQgaW50IGNtZCwKPj4gICAJCXJldHVy biAtRUZBVUxUOwo+PiAgIAo+PiAgIAlyZXF1ZXN0ID0gY29tcGF0X2FsbG9jX3VzZXJfc3BhY2Uo c2l6ZW9mKCpyZXF1ZXN0KSk7Cj4+IC0JaWYgKCFhY2Nlc3Nfb2soVkVSSUZZX1dSSVRFLCByZXF1 ZXN0LCBzaXplb2YoKnJlcXVlc3QpKSkKPj4gKwlpZiAoIXJlcXVlc3QpCj4+ICAgCQlyZXR1cm4g LUVGQVVMVDsKPj4gICAJaWYgKF9fcHV0X3VzZXIocmVxMzIuY291bnQsICZyZXF1ZXN0LT5jb3Vu dCkKPj4gICAJICAgIHx8IF9fcHV0X3VzZXIoKGludCBfX3VzZXIgKikodW5zaWduZWQgbG9uZyly ZXEzMi5saXN0LAo+PiBAQCAtNTg5LDcgKzU4OCw3IEBAIHN0YXRpYyBpbnQgY29tcGF0X2RybV9z ZXRzYXJlYWN0eChzdHJ1Y3QgZmlsZSAqZmlsZSwgdW5zaWduZWQgaW50IGNtZCwKPj4gICAJCXJl dHVybiAtRUZBVUxUOwo+PiAgIAo+PiAgIAlyZXF1ZXN0ID0gY29tcGF0X2FsbG9jX3VzZXJfc3Bh Y2Uoc2l6ZW9mKCpyZXF1ZXN0KSk7Cj4+IC0JaWYgKCFhY2Nlc3Nfb2soVkVSSUZZX1dSSVRFLCBy ZXF1ZXN0LCBzaXplb2YoKnJlcXVlc3QpKSkKPj4gKwlpZiAoIXJlcXVlc3QpCj4+ICAgCQlyZXR1 cm4gLUVGQVVMVDsKPj4gICAJaWYgKF9fcHV0X3VzZXIocmVxMzIuY3R4X2lkLCAmcmVxdWVzdC0+ Y3R4X2lkKQo+PiAgIAkgICAgfHwgX19wdXRfdXNlcigodm9pZCAqKSh1bnNpZ25lZCBsb25nKXJl cTMyLmhhbmRsZSwKPj4gQEAgLTYxMyw3ICs2MTIsNyBAQCBzdGF0aWMgaW50IGNvbXBhdF9kcm1f Z2V0c2FyZWFjdHgoc3RydWN0IGZpbGUgKmZpbGUsIHVuc2lnbmVkIGludCBjbWQsCj4+ICAgCQly ZXR1cm4gLUVGQVVMVDsKPj4gICAKPj4gICAJcmVxdWVzdCA9IGNvbXBhdF9hbGxvY191c2VyX3Nw YWNlKHNpemVvZigqcmVxdWVzdCkpOwo+PiAtCWlmICghYWNjZXNzX29rKFZFUklGWV9XUklURSwg cmVxdWVzdCwgc2l6ZW9mKCpyZXF1ZXN0KSkpCj4+ICsJaWYgKCFyZXF1ZXN0KQo+PiAgIAkJcmV0 dXJuIC1FRkFVTFQ7Cj4+ICAgCWlmIChfX3B1dF91c2VyKGN0eF9pZCwgJnJlcXVlc3QtPmN0eF9p ZCkpCj4+ICAgCQlyZXR1cm4gLUVGQVVMVDsKPj4gQEAgLTY0Niw3ICs2NDUsNyBAQCBzdGF0aWMg aW50IGNvbXBhdF9kcm1fcmVzY3R4KHN0cnVjdCBmaWxlICpmaWxlLCB1bnNpZ25lZCBpbnQgY21k LAo+PiAgIAkJcmV0dXJuIC1FRkFVTFQ7Cj4+ICAgCj4+ICAgCXJlcyA9IGNvbXBhdF9hbGxvY191 c2VyX3NwYWNlKHNpemVvZigqcmVzKSk7Cj4+IC0JaWYgKCFhY2Nlc3Nfb2soVkVSSUZZX1dSSVRF LCByZXMsIHNpemVvZigqcmVzKSkpCj4+ICsJaWYgKCFyZXMpCj4+ICAgCQlyZXR1cm4gLUVGQVVM VDsKPj4gICAJaWYgKF9fcHV0X3VzZXIocmVzMzIuY291bnQsICZyZXMtPmNvdW50KQo+PiAgIAkg ICAgfHwgX19wdXRfdXNlcigoc3RydWN0IGRybV9jdHggX191c2VyICopICh1bnNpZ25lZCBsb25n KXJlczMyLmNvbnRleHRzLAo+PiBAQCAtNjg5LDcgKzY4OCw3IEBAIHN0YXRpYyBpbnQgY29tcGF0 X2RybV9kbWEoc3RydWN0IGZpbGUgKmZpbGUsIHVuc2lnbmVkIGludCBjbWQsCj4+ICAgCQlyZXR1 cm4gLUVGQVVMVDsKPj4gICAKPj4gICAJZCA9IGNvbXBhdF9hbGxvY191c2VyX3NwYWNlKHNpemVv ZigqZCkpOwo+PiAtCWlmICghYWNjZXNzX29rKFZFUklGWV9XUklURSwgZCwgc2l6ZW9mKCpkKSkp Cj4+ICsJaWYgKCFkKQo+PiAgIAkJcmV0dXJuIC1FRkFVTFQ7Cj4+ICAgCj4+ICAgCWlmIChfX3B1 dF91c2VyKGQzMi5jb250ZXh0LCAmZC0+Y29udGV4dCkKPj4gQEAgLTc2NCw3ICs3NjMsNyBAQCBz dGF0aWMgaW50IGNvbXBhdF9kcm1fYWdwX2luZm8oc3RydWN0IGZpbGUgKmZpbGUsIHVuc2lnbmVk IGludCBjbWQsCj4+ICAgCWludCBlcnI7Cj4+ICAgCj4+ICAgCWluZm8gPSBjb21wYXRfYWxsb2Nf dXNlcl9zcGFjZShzaXplb2YoKmluZm8pKTsKPj4gLQlpZiAoIWFjY2Vzc19vayhWRVJJRllfV1JJ VEUsIGluZm8sIHNpemVvZigqaW5mbykpKQo+PiArCWlmICghaW5mbykKPj4gICAJCXJldHVybiAt RUZBVUxUOwo+PiAgIAo+PiAgIAllcnIgPSBkcm1faW9jdGwoZmlsZSwgRFJNX0lPQ1RMX0FHUF9J TkZPLCAodW5zaWduZWQgbG9uZylpbmZvKTsKPj4gQEAgLTgwNyw3ICs4MDYsNyBAQCBzdGF0aWMg aW50IGNvbXBhdF9kcm1fYWdwX2FsbG9jKHN0cnVjdCBmaWxlICpmaWxlLCB1bnNpZ25lZCBpbnQg Y21kLAo+PiAgIAkJcmV0dXJuIC1FRkFVTFQ7Cj4+ICAgCj4+ICAgCXJlcXVlc3QgPSBjb21wYXRf YWxsb2NfdXNlcl9zcGFjZShzaXplb2YoKnJlcXVlc3QpKTsKPj4gLQlpZiAoIWFjY2Vzc19vayhW RVJJRllfV1JJVEUsIHJlcXVlc3QsIHNpemVvZigqcmVxdWVzdCkpCj4+ICsJaWYgKCFyZXF1ZXN0 Cj4+ICAgCSAgICB8fCBfX3B1dF91c2VyKHJlcTMyLnNpemUsICZyZXF1ZXN0LT5zaXplKQo+PiAg IAkgICAgfHwgX19wdXRfdXNlcihyZXEzMi50eXBlLCAmcmVxdWVzdC0+dHlwZSkpCj4+ICAgCQly ZXR1cm4gLUVGQVVMVDsKPj4gQEAgLTgzNCw3ICs4MzMsNyBAQCBzdGF0aWMgaW50IGNvbXBhdF9k cm1fYWdwX2ZyZWUoc3RydWN0IGZpbGUgKmZpbGUsIHVuc2lnbmVkIGludCBjbWQsCj4+ICAgCXUz MiBoYW5kbGU7Cj4+ICAgCj4+ICAgCXJlcXVlc3QgPSBjb21wYXRfYWxsb2NfdXNlcl9zcGFjZShz aXplb2YoKnJlcXVlc3QpKTsKPj4gLQlpZiAoIWFjY2Vzc19vayhWRVJJRllfV1JJVEUsIHJlcXVl c3QsIHNpemVvZigqcmVxdWVzdCkpCj4+ICsJaWYgKCFyZXF1ZXN0Cj4+ICAgCSAgICB8fCBnZXRf dXNlcihoYW5kbGUsICZhcmdwLT5oYW5kbGUpCj4+ICAgCSAgICB8fCBfX3B1dF91c2VyKGhhbmRs ZSwgJnJlcXVlc3QtPmhhbmRsZSkpCj4+ICAgCQlyZXR1cm4gLUVGQVVMVDsKPj4gQEAgLTg1OCw3 ICs4NTcsNyBAQCBzdGF0aWMgaW50IGNvbXBhdF9kcm1fYWdwX2JpbmQoc3RydWN0IGZpbGUgKmZp bGUsIHVuc2lnbmVkIGludCBjbWQsCj4+ICAgCQlyZXR1cm4gLUVGQVVMVDsKPj4gICAKPj4gICAJ cmVxdWVzdCA9IGNvbXBhdF9hbGxvY191c2VyX3NwYWNlKHNpemVvZigqcmVxdWVzdCkpOwo+PiAt CWlmICghYWNjZXNzX29rKFZFUklGWV9XUklURSwgcmVxdWVzdCwgc2l6ZW9mKCpyZXF1ZXN0KSkK Pj4gKwlpZiAoIXJlcXVlc3QKPj4gICAJICAgIHx8IF9fcHV0X3VzZXIocmVxMzIuaGFuZGxlLCAm cmVxdWVzdC0+aGFuZGxlKQo+PiAgIAkgICAgfHwgX19wdXRfdXNlcihyZXEzMi5vZmZzZXQsICZy ZXF1ZXN0LT5vZmZzZXQpKQo+PiAgIAkJcmV0dXJuIC1FRkFVTFQ7Cj4+IEBAIC04NzQsNyArODcz LDcgQEAgc3RhdGljIGludCBjb21wYXRfZHJtX2FncF91bmJpbmQoc3RydWN0IGZpbGUgKmZpbGUs IHVuc2lnbmVkIGludCBjbWQsCj4+ICAgCXUzMiBoYW5kbGU7Cj4+ICAgCj4+ICAgCXJlcXVlc3Qg PSBjb21wYXRfYWxsb2NfdXNlcl9zcGFjZShzaXplb2YoKnJlcXVlc3QpKTsKPj4gLQlpZiAoIWFj Y2Vzc19vayhWRVJJRllfV1JJVEUsIHJlcXVlc3QsIHNpemVvZigqcmVxdWVzdCkpCj4+ICsJaWYg KCFyZXF1ZXN0Cj4+ICAgCSAgICB8fCBnZXRfdXNlcihoYW5kbGUsICZhcmdwLT5oYW5kbGUpCj4+ ICAgCSAgICB8fCBfX3B1dF91c2VyKGhhbmRsZSwgJnJlcXVlc3QtPmhhbmRsZSkpCj4+ICAgCQly ZXR1cm4gLUVGQVVMVDsKPj4gQEAgLTg5Nyw4ICs4OTYsNyBAQCBzdGF0aWMgaW50IGNvbXBhdF9k cm1fc2dfYWxsb2Moc3RydWN0IGZpbGUgKmZpbGUsIHVuc2lnbmVkIGludCBjbWQsCj4+ICAgCXVu c2lnbmVkIGxvbmcgeDsKPj4gICAKPj4gICAJcmVxdWVzdCA9IGNvbXBhdF9hbGxvY191c2VyX3Nw YWNlKHNpemVvZigqcmVxdWVzdCkpOwo+PiAtCWlmICghYWNjZXNzX29rKFZFUklGWV9XUklURSwg cmVxdWVzdCwgc2l6ZW9mKCpyZXF1ZXN0KSkKPj4gLQkgICAgfHwgIWFjY2Vzc19vayhWRVJJRllf V1JJVEUsIGFyZ3AsIHNpemVvZigqYXJncCkpCj4+ICsJaWYgKCFyZXF1ZXN0IHx8ICFhcmdwCj4+ ICAgCSAgICB8fCBfX2dldF91c2VyKHgsICZhcmdwLT5zaXplKQo+PiAgIAkgICAgfHwgX19wdXRf dXNlcih4LCAmcmVxdWVzdC0+c2l6ZSkpCj4+ICAgCQlyZXR1cm4gLUVGQVVMVDsKPj4gQEAgLTky Myw4ICs5MjEsNyBAQCBzdGF0aWMgaW50IGNvbXBhdF9kcm1fc2dfZnJlZShzdHJ1Y3QgZmlsZSAq ZmlsZSwgdW5zaWduZWQgaW50IGNtZCwKPj4gICAJdW5zaWduZWQgbG9uZyB4Owo+PiAgIAo+PiAg IAlyZXF1ZXN0ID0gY29tcGF0X2FsbG9jX3VzZXJfc3BhY2Uoc2l6ZW9mKCpyZXF1ZXN0KSk7Cj4+ IC0JaWYgKCFhY2Nlc3Nfb2soVkVSSUZZX1dSSVRFLCByZXF1ZXN0LCBzaXplb2YoKnJlcXVlc3Qp KQo+PiAtCSAgICB8fCAhYWNjZXNzX29rKFZFUklGWV9XUklURSwgYXJncCwgc2l6ZW9mKCphcmdw KSkKPj4gKwlpZiAoIXJlcXVlc3QgfHwgIWFyZ3AKPj4gICAJICAgIHx8IF9fZ2V0X3VzZXIoeCwg JmFyZ3AtPmhhbmRsZSkKPj4gICAJICAgIHx8IF9fcHV0X3VzZXIoeCA8PCBQQUdFX1NISUZULCAm cmVxdWVzdC0+aGFuZGxlKSkKPj4gICAJCXJldHVybiAtRUZBVUxUOwo+PiBAQCAtOTUyLDcgKzk0 OSw3IEBAIHN0YXRpYyBpbnQgY29tcGF0X2RybV91cGRhdGVfZHJhdyhzdHJ1Y3QgZmlsZSAqZmls ZSwgdW5zaWduZWQgaW50IGNtZCwKPj4gICAJCXJldHVybiAtRUZBVUxUOwo+PiAgIAo+PiAgIAly ZXF1ZXN0ID0gY29tcGF0X2FsbG9jX3VzZXJfc3BhY2Uoc2l6ZW9mKCpyZXF1ZXN0KSk7Cj4+IC0J aWYgKCFhY2Nlc3Nfb2soVkVSSUZZX1dSSVRFLCByZXF1ZXN0LCBzaXplb2YoKnJlcXVlc3QpKSB8 fAo+PiArCWlmICghcmVxdWVzdCB8fAo+PiAgIAkgICAgX19wdXRfdXNlcih1cGRhdGUzMi5oYW5k bGUsICZyZXF1ZXN0LT5oYW5kbGUpIHx8Cj4+ICAgCSAgICBfX3B1dF91c2VyKHVwZGF0ZTMyLnR5 cGUsICZyZXF1ZXN0LT50eXBlKSB8fAo+PiAgIAkgICAgX19wdXRfdXNlcih1cGRhdGUzMi5udW0s ICZyZXF1ZXN0LT5udW0pIHx8Cj4+IEBAIC05OTQsNyArOTkxLDcgQEAgc3RhdGljIGludCBjb21w YXRfZHJtX3dhaXRfdmJsYW5rKHN0cnVjdCBmaWxlICpmaWxlLCB1bnNpZ25lZCBpbnQgY21kLAo+ PiAgIAkJcmV0dXJuIC1FRkFVTFQ7Cj4+ICAgCj4+ICAgCXJlcXVlc3QgPSBjb21wYXRfYWxsb2Nf dXNlcl9zcGFjZShzaXplb2YoKnJlcXVlc3QpKTsKPj4gLQlpZiAoIWFjY2Vzc19vayhWRVJJRllf V1JJVEUsIHJlcXVlc3QsIHNpemVvZigqcmVxdWVzdCkpCj4+ICsJaWYgKCFyZXF1ZXN0Cj4+ICAg CSAgICB8fCBfX3B1dF91c2VyKHJlcTMyLnJlcXVlc3QudHlwZSwgJnJlcXVlc3QtPnJlcXVlc3Qu dHlwZSkKPj4gICAJICAgIHx8IF9fcHV0X3VzZXIocmVxMzIucmVxdWVzdC5zZXF1ZW5jZSwgJnJl cXVlc3QtPnJlcXVlc3Quc2VxdWVuY2UpCj4+ICAgCSAgICB8fCBfX3B1dF91c2VyKHJlcTMyLnJl cXVlc3Quc2lnbmFsLCAmcmVxdWVzdC0+cmVxdWVzdC5zaWduYWwpKQo+PiAtLSAKPj4gMi4xLjQK Pj4KPj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPj4g ZHJpLWRldmVsIG1haWxpbmcgbGlzdAo+PiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cj4+IGh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2 ZWwKCi9KYXJra28KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755260AbbGCLDc (ORCPT ); Fri, 3 Jul 2015 07:03:32 -0400 Received: from mga02.intel.com ([134.134.136.20]:13320 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755204AbbGCLD0 (ORCPT ); Fri, 3 Jul 2015 07:03:26 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,399,1432623600"; d="scan'208";a="599534088" Message-ID: <55966BFB.8060308@linux.intel.com> Date: Fri, 03 Jul 2015 14:03:23 +0300 From: Jarkko Sakkinen User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Jani Nikula , airlied@linux.ie, dri-devel@lists.freedesktop.org CC: open list Subject: Re: [PATCH] drm: remove redundant code form drm_ioc32.c References: <1435742677-14158-1-git-send-email-jarkko.sakkinen@linux.intel.com> <87lhezugip.fsf@intel.com> In-Reply-To: <87lhezugip.fsf@intel.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/02/2015 11:10 AM, Jani Nikula wrote: > On Wed, 01 Jul 2015, Jarkko Sakkinen wrote: >> The compat ioctl handler ends up calling access_ok() twice: first >> indirectly inside compat_alloc_user_space() and then after returning >> from that function. This patch fixes issue. >> >> Signed-off-by: Jarkko Sakkinen >> --- >> drivers/gpu/drm/drm_ioc32.c | 55 +++++++++++++++++++++------------------------ >> 1 file changed, 26 insertions(+), 29 deletions(-) >> >> diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c >> index aa8bbb4..77b63e7 100644 >> --- a/drivers/gpu/drm/drm_ioc32.c >> +++ b/drivers/gpu/drm/drm_ioc32.c >> @@ -93,7 +93,7 @@ static int compat_drm_version(struct file *file, unsigned int cmd, >> return -EFAULT; >> >> version = compat_alloc_user_space(sizeof(*version)); >> - if (!access_ok(VERIFY_WRITE, version, sizeof(*version))) >> + if (!version) >> return -EFAULT; >> if (__put_user(v32.name_len, &version->name_len) >> || __put_user((void __user *)(unsigned long)v32.name, >> @@ -140,7 +140,7 @@ static int compat_drm_getunique(struct file *file, unsigned int cmd, >> return -EFAULT; >> >> u = compat_alloc_user_space(sizeof(*u)); >> - if (!access_ok(VERIFY_WRITE, u, sizeof(*u))) >> + if (!u) >> return -EFAULT; >> if (__put_user(uq32.unique_len, &u->unique_len) >> || __put_user((void __user *)(unsigned long)uq32.unique, >> @@ -168,7 +168,7 @@ static int compat_drm_setunique(struct file *file, unsigned int cmd, >> return -EFAULT; >> >> u = compat_alloc_user_space(sizeof(*u)); >> - if (!access_ok(VERIFY_WRITE, u, sizeof(*u))) >> + if (!u) >> return -EFAULT; >> if (__put_user(uq32.unique_len, &u->unique_len) >> || __put_user((void __user *)(unsigned long)uq32.unique, >> @@ -200,7 +200,7 @@ static int compat_drm_getmap(struct file *file, unsigned int cmd, >> return -EFAULT; >> >> map = compat_alloc_user_space(sizeof(*map)); >> - if (!access_ok(VERIFY_WRITE, map, sizeof(*map))) >> + if (!map) >> return -EFAULT; >> if (__put_user(idx, &map->offset)) >> return -EFAULT; >> @@ -237,7 +237,7 @@ static int compat_drm_addmap(struct file *file, unsigned int cmd, >> return -EFAULT; >> >> map = compat_alloc_user_space(sizeof(*map)); >> - if (!access_ok(VERIFY_WRITE, map, sizeof(*map))) >> + if (!map) >> return -EFAULT; >> if (__put_user(m32.offset, &map->offset) >> || __put_user(m32.size, &map->size) >> @@ -277,7 +277,7 @@ static int compat_drm_rmmap(struct file *file, unsigned int cmd, >> return -EFAULT; >> >> map = compat_alloc_user_space(sizeof(*map)); >> - if (!access_ok(VERIFY_WRITE, map, sizeof(*map))) >> + if (!map) >> return -EFAULT; >> if (__put_user((void *)(unsigned long)handle, &map->handle)) >> return -EFAULT; >> @@ -306,7 +306,7 @@ static int compat_drm_getclient(struct file *file, unsigned int cmd, >> return -EFAULT; >> >> client = compat_alloc_user_space(sizeof(*client)); >> - if (!access_ok(VERIFY_WRITE, client, sizeof(*client))) >> + if (!client) >> return -EFAULT; >> if (__put_user(idx, &client->idx)) >> return -EFAULT; >> @@ -345,7 +345,7 @@ static int compat_drm_getstats(struct file *file, unsigned int cmd, >> int i, err; >> >> stats = compat_alloc_user_space(sizeof(*stats)); >> - if (!access_ok(VERIFY_WRITE, stats, sizeof(*stats))) >> + if (!stats) >> return -EFAULT; >> >> err = drm_ioctl(file, DRM_IOCTL_GET_STATS, (unsigned long)stats); >> @@ -382,8 +382,7 @@ static int compat_drm_addbufs(struct file *file, unsigned int cmd, >> unsigned long agp_start; >> >> buf = compat_alloc_user_space(sizeof(*buf)); >> - if (!access_ok(VERIFY_WRITE, buf, sizeof(*buf)) >> - || !access_ok(VERIFY_WRITE, argp, sizeof(*argp))) >> + if (!buf || !argp) > The risks of touching old code... who does access_ok on argp now? That > doesn't come from compat_alloc_user_space. > > Same pattern repeated below a few times. Right. Thanks and sorry about sloppiness. I'll update the patch. > > BR, > Jani. > > >> return -EFAULT; >> >> if (__copy_in_user(buf, argp, offsetof(drm_buf_desc32_t, agp_start)) >> @@ -414,7 +413,7 @@ static int compat_drm_markbufs(struct file *file, unsigned int cmd, >> return -EFAULT; >> >> buf = compat_alloc_user_space(sizeof(*buf)); >> - if (!access_ok(VERIFY_WRITE, buf, sizeof(*buf))) >> + if (!buf) >> return -EFAULT; >> >> if (__put_user(b32.size, &buf->size) >> @@ -455,7 +454,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd, >> >> nbytes = sizeof(*request) + count * sizeof(struct drm_buf_desc); >> request = compat_alloc_user_space(nbytes); >> - if (!access_ok(VERIFY_WRITE, request, nbytes)) >> + if (!request) >> return -EFAULT; >> list = (struct drm_buf_desc *) (request + 1); >> >> @@ -516,7 +515,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd, >> return -EINVAL; >> nbytes = sizeof(*request) + count * sizeof(struct drm_buf_pub); >> request = compat_alloc_user_space(nbytes); >> - if (!access_ok(VERIFY_WRITE, request, nbytes)) >> + if (!request) >> return -EFAULT; >> list = (struct drm_buf_pub *) (request + 1); >> >> @@ -563,7 +562,7 @@ static int compat_drm_freebufs(struct file *file, unsigned int cmd, >> return -EFAULT; >> >> request = compat_alloc_user_space(sizeof(*request)); >> - if (!access_ok(VERIFY_WRITE, request, sizeof(*request))) >> + if (!request) >> return -EFAULT; >> if (__put_user(req32.count, &request->count) >> || __put_user((int __user *)(unsigned long)req32.list, >> @@ -589,7 +588,7 @@ static int compat_drm_setsareactx(struct file *file, unsigned int cmd, >> return -EFAULT; >> >> request = compat_alloc_user_space(sizeof(*request)); >> - if (!access_ok(VERIFY_WRITE, request, sizeof(*request))) >> + if (!request) >> return -EFAULT; >> if (__put_user(req32.ctx_id, &request->ctx_id) >> || __put_user((void *)(unsigned long)req32.handle, >> @@ -613,7 +612,7 @@ static int compat_drm_getsareactx(struct file *file, unsigned int cmd, >> return -EFAULT; >> >> request = compat_alloc_user_space(sizeof(*request)); >> - if (!access_ok(VERIFY_WRITE, request, sizeof(*request))) >> + if (!request) >> return -EFAULT; >> if (__put_user(ctx_id, &request->ctx_id)) >> return -EFAULT; >> @@ -646,7 +645,7 @@ static int compat_drm_resctx(struct file *file, unsigned int cmd, >> return -EFAULT; >> >> res = compat_alloc_user_space(sizeof(*res)); >> - if (!access_ok(VERIFY_WRITE, res, sizeof(*res))) >> + if (!res) >> return -EFAULT; >> if (__put_user(res32.count, &res->count) >> || __put_user((struct drm_ctx __user *) (unsigned long)res32.contexts, >> @@ -689,7 +688,7 @@ static int compat_drm_dma(struct file *file, unsigned int cmd, >> return -EFAULT; >> >> d = compat_alloc_user_space(sizeof(*d)); >> - if (!access_ok(VERIFY_WRITE, d, sizeof(*d))) >> + if (!d) >> return -EFAULT; >> >> if (__put_user(d32.context, &d->context) >> @@ -764,7 +763,7 @@ static int compat_drm_agp_info(struct file *file, unsigned int cmd, >> int err; >> >> info = compat_alloc_user_space(sizeof(*info)); >> - if (!access_ok(VERIFY_WRITE, info, sizeof(*info))) >> + if (!info) >> return -EFAULT; >> >> err = drm_ioctl(file, DRM_IOCTL_AGP_INFO, (unsigned long)info); >> @@ -807,7 +806,7 @@ static int compat_drm_agp_alloc(struct file *file, unsigned int cmd, >> return -EFAULT; >> >> request = compat_alloc_user_space(sizeof(*request)); >> - if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) >> + if (!request >> || __put_user(req32.size, &request->size) >> || __put_user(req32.type, &request->type)) >> return -EFAULT; >> @@ -834,7 +833,7 @@ static int compat_drm_agp_free(struct file *file, unsigned int cmd, >> u32 handle; >> >> request = compat_alloc_user_space(sizeof(*request)); >> - if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) >> + if (!request >> || get_user(handle, &argp->handle) >> || __put_user(handle, &request->handle)) >> return -EFAULT; >> @@ -858,7 +857,7 @@ static int compat_drm_agp_bind(struct file *file, unsigned int cmd, >> return -EFAULT; >> >> request = compat_alloc_user_space(sizeof(*request)); >> - if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) >> + if (!request >> || __put_user(req32.handle, &request->handle) >> || __put_user(req32.offset, &request->offset)) >> return -EFAULT; >> @@ -874,7 +873,7 @@ static int compat_drm_agp_unbind(struct file *file, unsigned int cmd, >> u32 handle; >> >> request = compat_alloc_user_space(sizeof(*request)); >> - if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) >> + if (!request >> || get_user(handle, &argp->handle) >> || __put_user(handle, &request->handle)) >> return -EFAULT; >> @@ -897,8 +896,7 @@ static int compat_drm_sg_alloc(struct file *file, unsigned int cmd, >> unsigned long x; >> >> request = compat_alloc_user_space(sizeof(*request)); >> - if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) >> - || !access_ok(VERIFY_WRITE, argp, sizeof(*argp)) >> + if (!request || !argp >> || __get_user(x, &argp->size) >> || __put_user(x, &request->size)) >> return -EFAULT; >> @@ -923,8 +921,7 @@ static int compat_drm_sg_free(struct file *file, unsigned int cmd, >> unsigned long x; >> >> request = compat_alloc_user_space(sizeof(*request)); >> - if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) >> - || !access_ok(VERIFY_WRITE, argp, sizeof(*argp)) >> + if (!request || !argp >> || __get_user(x, &argp->handle) >> || __put_user(x << PAGE_SHIFT, &request->handle)) >> return -EFAULT; >> @@ -952,7 +949,7 @@ static int compat_drm_update_draw(struct file *file, unsigned int cmd, >> return -EFAULT; >> >> request = compat_alloc_user_space(sizeof(*request)); >> - if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) || >> + if (!request || >> __put_user(update32.handle, &request->handle) || >> __put_user(update32.type, &request->type) || >> __put_user(update32.num, &request->num) || >> @@ -994,7 +991,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd, >> return -EFAULT; >> >> request = compat_alloc_user_space(sizeof(*request)); >> - if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) >> + if (!request >> || __put_user(req32.request.type, &request->request.type) >> || __put_user(req32.request.sequence, &request->request.sequence) >> || __put_user(req32.request.signal, &request->request.signal)) >> -- >> 2.1.4 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/dri-devel /Jarkko