From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm: remove redundant code form drm_ioc32.c Date: Thu, 02 Jul 2015 11:10:06 +0300 Message-ID: <87lhezugip.fsf@intel.com> References: <1435742677-14158-1-git-send-email-jarkko.sakkinen@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 697946E4E5 for ; Thu, 2 Jul 2015 01:07:33 -0700 (PDT) In-Reply-To: <1435742677-14158-1-git-send-email-jarkko.sakkinen@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: airlied@linux.ie, dri-devel@lists.freedesktop.org Cc: open list , Jarkko Sakkinen List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCAwMSBKdWwgMjAxNSwgSmFya2tvIFNha2tpbmVuIDxqYXJra28uc2Fra2luZW5AbGlu dXguaW50ZWwuY29tPiB3cm90ZToKPiBUaGUgY29tcGF0IGlvY3RsIGhhbmRsZXIgZW5kcyB1cCBj YWxsaW5nIGFjY2Vzc19vaygpIHR3aWNlOiBmaXJzdAo+IGluZGlyZWN0bHkgaW5zaWRlIGNvbXBh dF9hbGxvY191c2VyX3NwYWNlKCkgYW5kIHRoZW4gYWZ0ZXIgcmV0dXJuaW5nCj4gZnJvbSB0aGF0 IGZ1bmN0aW9uLiBUaGlzIHBhdGNoIGZpeGVzIGlzc3VlLgo+Cj4gU2lnbmVkLW9mZi1ieTogSmFy a2tvIFNha2tpbmVuIDxqYXJra28uc2Fra2luZW5AbGludXguaW50ZWwuY29tPgo+IC0tLQo+ICBk cml2ZXJzL2dwdS9kcm0vZHJtX2lvYzMyLmMgfCA1NSArKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDI2IGluc2VydGlvbnMoKyks IDI5IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1faW9j MzIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1faW9jMzIuYwo+IGluZGV4IGFhOGJiYjQuLjc3YjYz ZTcgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9pb2MzMi5jCj4gKysrIGIvZHJp dmVycy9ncHUvZHJtL2RybV9pb2MzMi5jCj4gQEAgLTkzLDcgKzkzLDcgQEAgc3RhdGljIGludCBj b21wYXRfZHJtX3ZlcnNpb24oc3RydWN0IGZpbGUgKmZpbGUsIHVuc2lnbmVkIGludCBjbWQsCj4g IAkJcmV0dXJuIC1FRkFVTFQ7Cj4gIAo+ICAJdmVyc2lvbiA9IGNvbXBhdF9hbGxvY191c2VyX3Nw YWNlKHNpemVvZigqdmVyc2lvbikpOwo+IC0JaWYgKCFhY2Nlc3Nfb2soVkVSSUZZX1dSSVRFLCB2 ZXJzaW9uLCBzaXplb2YoKnZlcnNpb24pKSkKPiArCWlmICghdmVyc2lvbikKPiAgCQlyZXR1cm4g LUVGQVVMVDsKPiAgCWlmIChfX3B1dF91c2VyKHYzMi5uYW1lX2xlbiwgJnZlcnNpb24tPm5hbWVf bGVuKQo+ICAJICAgIHx8IF9fcHV0X3VzZXIoKHZvaWQgX191c2VyICopKHVuc2lnbmVkIGxvbmcp djMyLm5hbWUsCj4gQEAgLTE0MCw3ICsxNDAsNyBAQCBzdGF0aWMgaW50IGNvbXBhdF9kcm1fZ2V0 dW5pcXVlKHN0cnVjdCBmaWxlICpmaWxlLCB1bnNpZ25lZCBpbnQgY21kLAo+ICAJCXJldHVybiAt RUZBVUxUOwo+ICAKPiAgCXUgPSBjb21wYXRfYWxsb2NfdXNlcl9zcGFjZShzaXplb2YoKnUpKTsK PiAtCWlmICghYWNjZXNzX29rKFZFUklGWV9XUklURSwgdSwgc2l6ZW9mKCp1KSkpCj4gKwlpZiAo IXUpCj4gIAkJcmV0dXJuIC1FRkFVTFQ7Cj4gIAlpZiAoX19wdXRfdXNlcih1cTMyLnVuaXF1ZV9s ZW4sICZ1LT51bmlxdWVfbGVuKQo+ICAJICAgIHx8IF9fcHV0X3VzZXIoKHZvaWQgX191c2VyICop KHVuc2lnbmVkIGxvbmcpdXEzMi51bmlxdWUsCj4gQEAgLTE2OCw3ICsxNjgsNyBAQCBzdGF0aWMg aW50IGNvbXBhdF9kcm1fc2V0dW5pcXVlKHN0cnVjdCBmaWxlICpmaWxlLCB1bnNpZ25lZCBpbnQg Y21kLAo+ICAJCXJldHVybiAtRUZBVUxUOwo+ICAKPiAgCXUgPSBjb21wYXRfYWxsb2NfdXNlcl9z cGFjZShzaXplb2YoKnUpKTsKPiAtCWlmICghYWNjZXNzX29rKFZFUklGWV9XUklURSwgdSwgc2l6 ZW9mKCp1KSkpCj4gKwlpZiAoIXUpCj4gIAkJcmV0dXJuIC1FRkFVTFQ7Cj4gIAlpZiAoX19wdXRf dXNlcih1cTMyLnVuaXF1ZV9sZW4sICZ1LT51bmlxdWVfbGVuKQo+ICAJICAgIHx8IF9fcHV0X3Vz ZXIoKHZvaWQgX191c2VyICopKHVuc2lnbmVkIGxvbmcpdXEzMi51bmlxdWUsCj4gQEAgLTIwMCw3 ICsyMDAsNyBAQCBzdGF0aWMgaW50IGNvbXBhdF9kcm1fZ2V0bWFwKHN0cnVjdCBmaWxlICpmaWxl LCB1bnNpZ25lZCBpbnQgY21kLAo+ICAJCXJldHVybiAtRUZBVUxUOwo+ICAKPiAgCW1hcCA9IGNv bXBhdF9hbGxvY191c2VyX3NwYWNlKHNpemVvZigqbWFwKSk7Cj4gLQlpZiAoIWFjY2Vzc19vayhW RVJJRllfV1JJVEUsIG1hcCwgc2l6ZW9mKCptYXApKSkKPiArCWlmICghbWFwKQo+ICAJCXJldHVy biAtRUZBVUxUOwo+ICAJaWYgKF9fcHV0X3VzZXIoaWR4LCAmbWFwLT5vZmZzZXQpKQo+ICAJCXJl dHVybiAtRUZBVUxUOwo+IEBAIC0yMzcsNyArMjM3LDcgQEAgc3RhdGljIGludCBjb21wYXRfZHJt X2FkZG1hcChzdHJ1Y3QgZmlsZSAqZmlsZSwgdW5zaWduZWQgaW50IGNtZCwKPiAgCQlyZXR1cm4g LUVGQVVMVDsKPiAgCj4gIAltYXAgPSBjb21wYXRfYWxsb2NfdXNlcl9zcGFjZShzaXplb2YoKm1h cCkpOwo+IC0JaWYgKCFhY2Nlc3Nfb2soVkVSSUZZX1dSSVRFLCBtYXAsIHNpemVvZigqbWFwKSkp Cj4gKwlpZiAoIW1hcCkKPiAgCQlyZXR1cm4gLUVGQVVMVDsKPiAgCWlmIChfX3B1dF91c2VyKG0z Mi5vZmZzZXQsICZtYXAtPm9mZnNldCkKPiAgCSAgICB8fCBfX3B1dF91c2VyKG0zMi5zaXplLCAm bWFwLT5zaXplKQo+IEBAIC0yNzcsNyArMjc3LDcgQEAgc3RhdGljIGludCBjb21wYXRfZHJtX3Jt bWFwKHN0cnVjdCBmaWxlICpmaWxlLCB1bnNpZ25lZCBpbnQgY21kLAo+ICAJCXJldHVybiAtRUZB VUxUOwo+ICAKPiAgCW1hcCA9IGNvbXBhdF9hbGxvY191c2VyX3NwYWNlKHNpemVvZigqbWFwKSk7 Cj4gLQlpZiAoIWFjY2Vzc19vayhWRVJJRllfV1JJVEUsIG1hcCwgc2l6ZW9mKCptYXApKSkKPiAr CWlmICghbWFwKQo+ICAJCXJldHVybiAtRUZBVUxUOwo+ICAJaWYgKF9fcHV0X3VzZXIoKHZvaWQg KikodW5zaWduZWQgbG9uZyloYW5kbGUsICZtYXAtPmhhbmRsZSkpCj4gIAkJcmV0dXJuIC1FRkFV TFQ7Cj4gQEAgLTMwNiw3ICszMDYsNyBAQCBzdGF0aWMgaW50IGNvbXBhdF9kcm1fZ2V0Y2xpZW50 KHN0cnVjdCBmaWxlICpmaWxlLCB1bnNpZ25lZCBpbnQgY21kLAo+ICAJCXJldHVybiAtRUZBVUxU Owo+ICAKPiAgCWNsaWVudCA9IGNvbXBhdF9hbGxvY191c2VyX3NwYWNlKHNpemVvZigqY2xpZW50 KSk7Cj4gLQlpZiAoIWFjY2Vzc19vayhWRVJJRllfV1JJVEUsIGNsaWVudCwgc2l6ZW9mKCpjbGll bnQpKSkKPiArCWlmICghY2xpZW50KQo+ICAJCXJldHVybiAtRUZBVUxUOwo+ICAJaWYgKF9fcHV0 X3VzZXIoaWR4LCAmY2xpZW50LT5pZHgpKQo+ICAJCXJldHVybiAtRUZBVUxUOwo+IEBAIC0zNDUs NyArMzQ1LDcgQEAgc3RhdGljIGludCBjb21wYXRfZHJtX2dldHN0YXRzKHN0cnVjdCBmaWxlICpm aWxlLCB1bnNpZ25lZCBpbnQgY21kLAo+ICAJaW50IGksIGVycjsKPiAgCj4gIAlzdGF0cyA9IGNv bXBhdF9hbGxvY191c2VyX3NwYWNlKHNpemVvZigqc3RhdHMpKTsKPiAtCWlmICghYWNjZXNzX29r KFZFUklGWV9XUklURSwgc3RhdHMsIHNpemVvZigqc3RhdHMpKSkKPiArCWlmICghc3RhdHMpCj4g IAkJcmV0dXJuIC1FRkFVTFQ7Cj4gIAo+ICAJZXJyID0gZHJtX2lvY3RsKGZpbGUsIERSTV9JT0NU TF9HRVRfU1RBVFMsICh1bnNpZ25lZCBsb25nKXN0YXRzKTsKPiBAQCAtMzgyLDggKzM4Miw3IEBA IHN0YXRpYyBpbnQgY29tcGF0X2RybV9hZGRidWZzKHN0cnVjdCBmaWxlICpmaWxlLCB1bnNpZ25l ZCBpbnQgY21kLAo+ICAJdW5zaWduZWQgbG9uZyBhZ3Bfc3RhcnQ7Cj4gIAo+ICAJYnVmID0gY29t cGF0X2FsbG9jX3VzZXJfc3BhY2Uoc2l6ZW9mKCpidWYpKTsKPiAtCWlmICghYWNjZXNzX29rKFZF UklGWV9XUklURSwgYnVmLCBzaXplb2YoKmJ1ZikpCj4gLQkgICAgfHwgIWFjY2Vzc19vayhWRVJJ RllfV1JJVEUsIGFyZ3AsIHNpemVvZigqYXJncCkpKQo+ICsJaWYgKCFidWYgfHwgIWFyZ3ApCgpU aGUgcmlza3Mgb2YgdG91Y2hpbmcgb2xkIGNvZGUuLi4gd2hvIGRvZXMgYWNjZXNzX29rIG9uIGFy Z3Agbm93PyBUaGF0CmRvZXNuJ3QgY29tZSBmcm9tIGNvbXBhdF9hbGxvY191c2VyX3NwYWNlLgoK U2FtZSBwYXR0ZXJuIHJlcGVhdGVkIGJlbG93IGEgZmV3IHRpbWVzLgoKQlIsCkphbmkuCgoKPiAg CQlyZXR1cm4gLUVGQVVMVDsKPiAgCj4gIAlpZiAoX19jb3B5X2luX3VzZXIoYnVmLCBhcmdwLCBv ZmZzZXRvZihkcm1fYnVmX2Rlc2MzMl90LCBhZ3Bfc3RhcnQpKQo+IEBAIC00MTQsNyArNDEzLDcg QEAgc3RhdGljIGludCBjb21wYXRfZHJtX21hcmtidWZzKHN0cnVjdCBmaWxlICpmaWxlLCB1bnNp Z25lZCBpbnQgY21kLAo+ICAJCXJldHVybiAtRUZBVUxUOwo+ICAKPiAgCWJ1ZiA9IGNvbXBhdF9h bGxvY191c2VyX3NwYWNlKHNpemVvZigqYnVmKSk7Cj4gLQlpZiAoIWFjY2Vzc19vayhWRVJJRllf V1JJVEUsIGJ1Ziwgc2l6ZW9mKCpidWYpKSkKPiArCWlmICghYnVmKQo+ICAJCXJldHVybiAtRUZB VUxUOwo+ICAKPiAgCWlmIChfX3B1dF91c2VyKGIzMi5zaXplLCAmYnVmLT5zaXplKQo+IEBAIC00 NTUsNyArNDU0LDcgQEAgc3RhdGljIGludCBjb21wYXRfZHJtX2luZm9idWZzKHN0cnVjdCBmaWxl ICpmaWxlLCB1bnNpZ25lZCBpbnQgY21kLAo+ICAKPiAgCW5ieXRlcyA9IHNpemVvZigqcmVxdWVz dCkgKyBjb3VudCAqIHNpemVvZihzdHJ1Y3QgZHJtX2J1Zl9kZXNjKTsKPiAgCXJlcXVlc3QgPSBj b21wYXRfYWxsb2NfdXNlcl9zcGFjZShuYnl0ZXMpOwo+IC0JaWYgKCFhY2Nlc3Nfb2soVkVSSUZZ X1dSSVRFLCByZXF1ZXN0LCBuYnl0ZXMpKQo+ICsJaWYgKCFyZXF1ZXN0KQo+ICAJCXJldHVybiAt RUZBVUxUOwo+ICAJbGlzdCA9IChzdHJ1Y3QgZHJtX2J1Zl9kZXNjICopIChyZXF1ZXN0ICsgMSk7 Cj4gIAo+IEBAIC01MTYsNyArNTE1LDcgQEAgc3RhdGljIGludCBjb21wYXRfZHJtX21hcGJ1ZnMo c3RydWN0IGZpbGUgKmZpbGUsIHVuc2lnbmVkIGludCBjbWQsCj4gIAkJcmV0dXJuIC1FSU5WQUw7 Cj4gIAluYnl0ZXMgPSBzaXplb2YoKnJlcXVlc3QpICsgY291bnQgKiBzaXplb2Yoc3RydWN0IGRy bV9idWZfcHViKTsKPiAgCXJlcXVlc3QgPSBjb21wYXRfYWxsb2NfdXNlcl9zcGFjZShuYnl0ZXMp Owo+IC0JaWYgKCFhY2Nlc3Nfb2soVkVSSUZZX1dSSVRFLCByZXF1ZXN0LCBuYnl0ZXMpKQo+ICsJ aWYgKCFyZXF1ZXN0KQo+ICAJCXJldHVybiAtRUZBVUxUOwo+ICAJbGlzdCA9IChzdHJ1Y3QgZHJt X2J1Zl9wdWIgKikgKHJlcXVlc3QgKyAxKTsKPiAgCj4gQEAgLTU2Myw3ICs1NjIsNyBAQCBzdGF0 aWMgaW50IGNvbXBhdF9kcm1fZnJlZWJ1ZnMoc3RydWN0IGZpbGUgKmZpbGUsIHVuc2lnbmVkIGlu dCBjbWQsCj4gIAkJcmV0dXJuIC1FRkFVTFQ7Cj4gIAo+ICAJcmVxdWVzdCA9IGNvbXBhdF9hbGxv Y191c2VyX3NwYWNlKHNpemVvZigqcmVxdWVzdCkpOwo+IC0JaWYgKCFhY2Nlc3Nfb2soVkVSSUZZ X1dSSVRFLCByZXF1ZXN0LCBzaXplb2YoKnJlcXVlc3QpKSkKPiArCWlmICghcmVxdWVzdCkKPiAg CQlyZXR1cm4gLUVGQVVMVDsKPiAgCWlmIChfX3B1dF91c2VyKHJlcTMyLmNvdW50LCAmcmVxdWVz dC0+Y291bnQpCj4gIAkgICAgfHwgX19wdXRfdXNlcigoaW50IF9fdXNlciAqKSh1bnNpZ25lZCBs b25nKXJlcTMyLmxpc3QsCj4gQEAgLTU4OSw3ICs1ODgsNyBAQCBzdGF0aWMgaW50IGNvbXBhdF9k cm1fc2V0c2FyZWFjdHgoc3RydWN0IGZpbGUgKmZpbGUsIHVuc2lnbmVkIGludCBjbWQsCj4gIAkJ cmV0dXJuIC1FRkFVTFQ7Cj4gIAo+ICAJcmVxdWVzdCA9IGNvbXBhdF9hbGxvY191c2VyX3NwYWNl KHNpemVvZigqcmVxdWVzdCkpOwo+IC0JaWYgKCFhY2Nlc3Nfb2soVkVSSUZZX1dSSVRFLCByZXF1 ZXN0LCBzaXplb2YoKnJlcXVlc3QpKSkKPiArCWlmICghcmVxdWVzdCkKPiAgCQlyZXR1cm4gLUVG QVVMVDsKPiAgCWlmIChfX3B1dF91c2VyKHJlcTMyLmN0eF9pZCwgJnJlcXVlc3QtPmN0eF9pZCkK PiAgCSAgICB8fCBfX3B1dF91c2VyKCh2b2lkICopKHVuc2lnbmVkIGxvbmcpcmVxMzIuaGFuZGxl LAo+IEBAIC02MTMsNyArNjEyLDcgQEAgc3RhdGljIGludCBjb21wYXRfZHJtX2dldHNhcmVhY3R4 KHN0cnVjdCBmaWxlICpmaWxlLCB1bnNpZ25lZCBpbnQgY21kLAo+ICAJCXJldHVybiAtRUZBVUxU Owo+ICAKPiAgCXJlcXVlc3QgPSBjb21wYXRfYWxsb2NfdXNlcl9zcGFjZShzaXplb2YoKnJlcXVl c3QpKTsKPiAtCWlmICghYWNjZXNzX29rKFZFUklGWV9XUklURSwgcmVxdWVzdCwgc2l6ZW9mKCpy ZXF1ZXN0KSkpCj4gKwlpZiAoIXJlcXVlc3QpCj4gIAkJcmV0dXJuIC1FRkFVTFQ7Cj4gIAlpZiAo X19wdXRfdXNlcihjdHhfaWQsICZyZXF1ZXN0LT5jdHhfaWQpKQo+ICAJCXJldHVybiAtRUZBVUxU Owo+IEBAIC02NDYsNyArNjQ1LDcgQEAgc3RhdGljIGludCBjb21wYXRfZHJtX3Jlc2N0eChzdHJ1 Y3QgZmlsZSAqZmlsZSwgdW5zaWduZWQgaW50IGNtZCwKPiAgCQlyZXR1cm4gLUVGQVVMVDsKPiAg Cj4gIAlyZXMgPSBjb21wYXRfYWxsb2NfdXNlcl9zcGFjZShzaXplb2YoKnJlcykpOwo+IC0JaWYg KCFhY2Nlc3Nfb2soVkVSSUZZX1dSSVRFLCByZXMsIHNpemVvZigqcmVzKSkpCj4gKwlpZiAoIXJl cykKPiAgCQlyZXR1cm4gLUVGQVVMVDsKPiAgCWlmIChfX3B1dF91c2VyKHJlczMyLmNvdW50LCAm cmVzLT5jb3VudCkKPiAgCSAgICB8fCBfX3B1dF91c2VyKChzdHJ1Y3QgZHJtX2N0eCBfX3VzZXIg KikgKHVuc2lnbmVkIGxvbmcpcmVzMzIuY29udGV4dHMsCj4gQEAgLTY4OSw3ICs2ODgsNyBAQCBz dGF0aWMgaW50IGNvbXBhdF9kcm1fZG1hKHN0cnVjdCBmaWxlICpmaWxlLCB1bnNpZ25lZCBpbnQg Y21kLAo+ICAJCXJldHVybiAtRUZBVUxUOwo+ICAKPiAgCWQgPSBjb21wYXRfYWxsb2NfdXNlcl9z cGFjZShzaXplb2YoKmQpKTsKPiAtCWlmICghYWNjZXNzX29rKFZFUklGWV9XUklURSwgZCwgc2l6 ZW9mKCpkKSkpCj4gKwlpZiAoIWQpCj4gIAkJcmV0dXJuIC1FRkFVTFQ7Cj4gIAo+ICAJaWYgKF9f cHV0X3VzZXIoZDMyLmNvbnRleHQsICZkLT5jb250ZXh0KQo+IEBAIC03NjQsNyArNzYzLDcgQEAg c3RhdGljIGludCBjb21wYXRfZHJtX2FncF9pbmZvKHN0cnVjdCBmaWxlICpmaWxlLCB1bnNpZ25l ZCBpbnQgY21kLAo+ICAJaW50IGVycjsKPiAgCj4gIAlpbmZvID0gY29tcGF0X2FsbG9jX3VzZXJf c3BhY2Uoc2l6ZW9mKCppbmZvKSk7Cj4gLQlpZiAoIWFjY2Vzc19vayhWRVJJRllfV1JJVEUsIGlu Zm8sIHNpemVvZigqaW5mbykpKQo+ICsJaWYgKCFpbmZvKQo+ICAJCXJldHVybiAtRUZBVUxUOwo+ ICAKPiAgCWVyciA9IGRybV9pb2N0bChmaWxlLCBEUk1fSU9DVExfQUdQX0lORk8sICh1bnNpZ25l ZCBsb25nKWluZm8pOwo+IEBAIC04MDcsNyArODA2LDcgQEAgc3RhdGljIGludCBjb21wYXRfZHJt X2FncF9hbGxvYyhzdHJ1Y3QgZmlsZSAqZmlsZSwgdW5zaWduZWQgaW50IGNtZCwKPiAgCQlyZXR1 cm4gLUVGQVVMVDsKPiAgCj4gIAlyZXF1ZXN0ID0gY29tcGF0X2FsbG9jX3VzZXJfc3BhY2Uoc2l6 ZW9mKCpyZXF1ZXN0KSk7Cj4gLQlpZiAoIWFjY2Vzc19vayhWRVJJRllfV1JJVEUsIHJlcXVlc3Qs IHNpemVvZigqcmVxdWVzdCkpCj4gKwlpZiAoIXJlcXVlc3QKPiAgCSAgICB8fCBfX3B1dF91c2Vy KHJlcTMyLnNpemUsICZyZXF1ZXN0LT5zaXplKQo+ICAJICAgIHx8IF9fcHV0X3VzZXIocmVxMzIu dHlwZSwgJnJlcXVlc3QtPnR5cGUpKQo+ICAJCXJldHVybiAtRUZBVUxUOwo+IEBAIC04MzQsNyAr ODMzLDcgQEAgc3RhdGljIGludCBjb21wYXRfZHJtX2FncF9mcmVlKHN0cnVjdCBmaWxlICpmaWxl LCB1bnNpZ25lZCBpbnQgY21kLAo+ICAJdTMyIGhhbmRsZTsKPiAgCj4gIAlyZXF1ZXN0ID0gY29t cGF0X2FsbG9jX3VzZXJfc3BhY2Uoc2l6ZW9mKCpyZXF1ZXN0KSk7Cj4gLQlpZiAoIWFjY2Vzc19v ayhWRVJJRllfV1JJVEUsIHJlcXVlc3QsIHNpemVvZigqcmVxdWVzdCkpCj4gKwlpZiAoIXJlcXVl c3QKPiAgCSAgICB8fCBnZXRfdXNlcihoYW5kbGUsICZhcmdwLT5oYW5kbGUpCj4gIAkgICAgfHwg X19wdXRfdXNlcihoYW5kbGUsICZyZXF1ZXN0LT5oYW5kbGUpKQo+ICAJCXJldHVybiAtRUZBVUxU Owo+IEBAIC04NTgsNyArODU3LDcgQEAgc3RhdGljIGludCBjb21wYXRfZHJtX2FncF9iaW5kKHN0 cnVjdCBmaWxlICpmaWxlLCB1bnNpZ25lZCBpbnQgY21kLAo+ICAJCXJldHVybiAtRUZBVUxUOwo+ ICAKPiAgCXJlcXVlc3QgPSBjb21wYXRfYWxsb2NfdXNlcl9zcGFjZShzaXplb2YoKnJlcXVlc3Qp KTsKPiAtCWlmICghYWNjZXNzX29rKFZFUklGWV9XUklURSwgcmVxdWVzdCwgc2l6ZW9mKCpyZXF1 ZXN0KSkKPiArCWlmICghcmVxdWVzdAo+ICAJICAgIHx8IF9fcHV0X3VzZXIocmVxMzIuaGFuZGxl LCAmcmVxdWVzdC0+aGFuZGxlKQo+ICAJICAgIHx8IF9fcHV0X3VzZXIocmVxMzIub2Zmc2V0LCAm cmVxdWVzdC0+b2Zmc2V0KSkKPiAgCQlyZXR1cm4gLUVGQVVMVDsKPiBAQCAtODc0LDcgKzg3Myw3 IEBAIHN0YXRpYyBpbnQgY29tcGF0X2RybV9hZ3BfdW5iaW5kKHN0cnVjdCBmaWxlICpmaWxlLCB1 bnNpZ25lZCBpbnQgY21kLAo+ICAJdTMyIGhhbmRsZTsKPiAgCj4gIAlyZXF1ZXN0ID0gY29tcGF0 X2FsbG9jX3VzZXJfc3BhY2Uoc2l6ZW9mKCpyZXF1ZXN0KSk7Cj4gLQlpZiAoIWFjY2Vzc19vayhW RVJJRllfV1JJVEUsIHJlcXVlc3QsIHNpemVvZigqcmVxdWVzdCkpCj4gKwlpZiAoIXJlcXVlc3QK PiAgCSAgICB8fCBnZXRfdXNlcihoYW5kbGUsICZhcmdwLT5oYW5kbGUpCj4gIAkgICAgfHwgX19w dXRfdXNlcihoYW5kbGUsICZyZXF1ZXN0LT5oYW5kbGUpKQo+ICAJCXJldHVybiAtRUZBVUxUOwo+ IEBAIC04OTcsOCArODk2LDcgQEAgc3RhdGljIGludCBjb21wYXRfZHJtX3NnX2FsbG9jKHN0cnVj dCBmaWxlICpmaWxlLCB1bnNpZ25lZCBpbnQgY21kLAo+ICAJdW5zaWduZWQgbG9uZyB4Owo+ICAK PiAgCXJlcXVlc3QgPSBjb21wYXRfYWxsb2NfdXNlcl9zcGFjZShzaXplb2YoKnJlcXVlc3QpKTsK PiAtCWlmICghYWNjZXNzX29rKFZFUklGWV9XUklURSwgcmVxdWVzdCwgc2l6ZW9mKCpyZXF1ZXN0 KSkKPiAtCSAgICB8fCAhYWNjZXNzX29rKFZFUklGWV9XUklURSwgYXJncCwgc2l6ZW9mKCphcmdw KSkKPiArCWlmICghcmVxdWVzdCB8fCAhYXJncAo+ICAJICAgIHx8IF9fZ2V0X3VzZXIoeCwgJmFy Z3AtPnNpemUpCj4gIAkgICAgfHwgX19wdXRfdXNlcih4LCAmcmVxdWVzdC0+c2l6ZSkpCj4gIAkJ cmV0dXJuIC1FRkFVTFQ7Cj4gQEAgLTkyMyw4ICs5MjEsNyBAQCBzdGF0aWMgaW50IGNvbXBhdF9k cm1fc2dfZnJlZShzdHJ1Y3QgZmlsZSAqZmlsZSwgdW5zaWduZWQgaW50IGNtZCwKPiAgCXVuc2ln bmVkIGxvbmcgeDsKPiAgCj4gIAlyZXF1ZXN0ID0gY29tcGF0X2FsbG9jX3VzZXJfc3BhY2Uoc2l6 ZW9mKCpyZXF1ZXN0KSk7Cj4gLQlpZiAoIWFjY2Vzc19vayhWRVJJRllfV1JJVEUsIHJlcXVlc3Qs IHNpemVvZigqcmVxdWVzdCkpCj4gLQkgICAgfHwgIWFjY2Vzc19vayhWRVJJRllfV1JJVEUsIGFy Z3AsIHNpemVvZigqYXJncCkpCj4gKwlpZiAoIXJlcXVlc3QgfHwgIWFyZ3AKPiAgCSAgICB8fCBf X2dldF91c2VyKHgsICZhcmdwLT5oYW5kbGUpCj4gIAkgICAgfHwgX19wdXRfdXNlcih4IDw8IFBB R0VfU0hJRlQsICZyZXF1ZXN0LT5oYW5kbGUpKQo+ICAJCXJldHVybiAtRUZBVUxUOwo+IEBAIC05 NTIsNyArOTQ5LDcgQEAgc3RhdGljIGludCBjb21wYXRfZHJtX3VwZGF0ZV9kcmF3KHN0cnVjdCBm aWxlICpmaWxlLCB1bnNpZ25lZCBpbnQgY21kLAo+ICAJCXJldHVybiAtRUZBVUxUOwo+ICAKPiAg CXJlcXVlc3QgPSBjb21wYXRfYWxsb2NfdXNlcl9zcGFjZShzaXplb2YoKnJlcXVlc3QpKTsKPiAt CWlmICghYWNjZXNzX29rKFZFUklGWV9XUklURSwgcmVxdWVzdCwgc2l6ZW9mKCpyZXF1ZXN0KSkg fHwKPiArCWlmICghcmVxdWVzdCB8fAo+ICAJICAgIF9fcHV0X3VzZXIodXBkYXRlMzIuaGFuZGxl LCAmcmVxdWVzdC0+aGFuZGxlKSB8fAo+ICAJICAgIF9fcHV0X3VzZXIodXBkYXRlMzIudHlwZSwg JnJlcXVlc3QtPnR5cGUpIHx8Cj4gIAkgICAgX19wdXRfdXNlcih1cGRhdGUzMi5udW0sICZyZXF1 ZXN0LT5udW0pIHx8Cj4gQEAgLTk5NCw3ICs5OTEsNyBAQCBzdGF0aWMgaW50IGNvbXBhdF9kcm1f d2FpdF92Ymxhbmsoc3RydWN0IGZpbGUgKmZpbGUsIHVuc2lnbmVkIGludCBjbWQsCj4gIAkJcmV0 dXJuIC1FRkFVTFQ7Cj4gIAo+ICAJcmVxdWVzdCA9IGNvbXBhdF9hbGxvY191c2VyX3NwYWNlKHNp emVvZigqcmVxdWVzdCkpOwo+IC0JaWYgKCFhY2Nlc3Nfb2soVkVSSUZZX1dSSVRFLCByZXF1ZXN0 LCBzaXplb2YoKnJlcXVlc3QpKQo+ICsJaWYgKCFyZXF1ZXN0Cj4gIAkgICAgfHwgX19wdXRfdXNl cihyZXEzMi5yZXF1ZXN0LnR5cGUsICZyZXF1ZXN0LT5yZXF1ZXN0LnR5cGUpCj4gIAkgICAgfHwg X19wdXRfdXNlcihyZXEzMi5yZXF1ZXN0LnNlcXVlbmNlLCAmcmVxdWVzdC0+cmVxdWVzdC5zZXF1 ZW5jZSkKPiAgCSAgICB8fCBfX3B1dF91c2VyKHJlcTMyLnJlcXVlc3Quc2lnbmFsLCAmcmVxdWVz dC0+cmVxdWVzdC5zaWduYWwpKQo+IC0tIAo+IDIuMS40Cj4KPiBfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiBk cmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAoKLS0gCkphbmkgTmlrdWxhLCBJbnRlbCBP cGVuIFNvdXJjZSBUZWNobm9sb2d5IENlbnRlcgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753396AbbGBIHs (ORCPT ); Thu, 2 Jul 2015 04:07:48 -0400 Received: from mga14.intel.com ([192.55.52.115]:49983 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752835AbbGBIHi (ORCPT ); Thu, 2 Jul 2015 04:07:38 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,391,1432623600"; d="scan'208";a="754619799" From: Jani Nikula To: Jarkko Sakkinen , airlied@linux.ie, dri-devel@lists.freedesktop.org Cc: open list , Jarkko Sakkinen Subject: Re: [PATCH] drm: remove redundant code form drm_ioc32.c In-Reply-To: <1435742677-14158-1-git-send-email-jarkko.sakkinen@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1435742677-14158-1-git-send-email-jarkko.sakkinen@linux.intel.com> User-Agent: Notmuch/0.19+112~g77230b0 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Thu, 02 Jul 2015 11:10:06 +0300 Message-ID: <87lhezugip.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. 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 -- Jani Nikula, Intel Open Source Technology Center