From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 2/2] drm/i915: fix potential dangling else problems in for_each_ macros Date: Wed, 25 Nov 2015 09:30:02 +0100 Message-ID: <20151125083002.GI17050@phenom.ffwll.local> References: <1448392916-2281-1-git-send-email-jani.nikula@intel.com> <1448392916-2281-2-git-send-email-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1448392916-2281-2-git-send-email-jani.nikula@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 Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCBOb3YgMjQsIDIwMTUgYXQgMDk6MjE6NTZQTSArMDIwMCwgSmFuaSBOaWt1bGEgd3Jv dGU6Cj4gV2UgaGF2ZSBzZXJpb3VzIGRhbmdsaW5nIGVsc2UgYnVncyB3YWl0aW5nIHRvIGhhcHBl biBpbiBvdXIgZm9yX2VhY2hfCj4gc3R5bGUgbWFjcm9zIHdpdGggaWZzLiBDb25zaWRlciwgZm9y IGV4YW1wbGUsCj4gCj4gICNkZWZpbmUgZm9yX2VhY2hfcG93ZXJfZG9tYWluKGRvbWFpbiwgbWFz aykgICAgICAgICAgICAgICAgICAgICAgICAgXAo+ICAgICAgICAgIGZvciAoKGRvbWFpbikgPSAw OyAoZG9tYWluKSA8IFBPV0VSX0RPTUFJTl9OVU07IChkb21haW4pKyspIFwKPiAgICAgICAgICAg ICAgICAgIGlmICgoMSA8PCAoZG9tYWluKSkgJiAobWFzaykpCj4gCj4gSWYgdGhpcyBpcyB1c2Vk IGluIGNvbnRleHQ6Cj4gCj4gCWlmIChjb25kaXRpb24pCj4gCQlmb3JfZWFjaF9wb3dlcl9kb21h aW4oZG9tYWluLCBtYXNrKTsKPiAJZWxzZQo+IAkJZm9vKCk7Cj4gCj4gZm9vKCkgd2lsbCBiZSBj YWxsZWQgZm9yIGVhY2ggZG9tYWluICpub3QqIGluIG1hc2ssIGlmIGNvbmRpdGlvbiBob2xkcywK PiBhbmQgbm90IGF0IGFsbCBpZiBjb25kaXRpb24gZG9lc24ndCBob2xkLgo+IAo+IEZpeCB0aGlz IGJ5IHJldmVyc2luZyB0aGUgY29uZGl0aW9ucyBpbiB0aGUgbWFjcm9zLCBhbmQgYWRkaW5nIGFu IGVsc2UKPiBicmFuY2ggZm9yIHRoZSAiZm9yIGVhY2giIGJsb2NrLCBzbyB0aGF0IG90aGVyIGlm L2Vsc2UgYmxvY2tzIGNhbid0Cj4gaW50ZXJmZXJlLiBQcm92aWRlIGEgImZvcl9lYWNoX2lmIiBo ZWxwZXIgbWFjcm8gdG8gbWFrZSBpdCBlYXNpZXIgdG8gZ2V0Cj4gdGhpcyByaWdodC4KPiAKPiB2 MjogbW92ZSBmb3JfZWFjaF9pZiB0byBkcm1QLmggaW4gYSBzZXBhcmF0ZSBwYXRjaC4KPiAKPiBS ZXZpZXdlZC1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KPiBTaWdu ZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgoKQm90aCBhcHBs aWVkIHRvIGRybS1taXNjLCB0aGFua3MgZm9yIHJlc3Bpbm5pbmcgd2l0aCBkcm0gaGVhZGVycyBp bmNsdWRlZC4KLURhbmllbAoKPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aCAgICAgICAgIHwgMTIgKysrKysrLS0tLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYyAgICB8ICAyICstCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RzaS5o ICAgICAgICB8ICAyICstCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0u YyB8ICA0ICsrLS0KPiAgNCBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCAxMCBkZWxl dGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiBpbmRleCAzZDg3NDFlZmY3ZDMu LjExYWU1YTVhMGEyZSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+IEBAIC0yODYsNyAr Mjg2LDcgQEAgc3RydWN0IGk5MTVfaG90cGx1ZyB7Cj4gIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KGlu dGVsX3BsYW5lLAkJCQlcCj4gIAkJCSAgICAmKGRldiktPm1vZGVfY29uZmlnLnBsYW5lX2xpc3Qs CQlcCj4gIAkJCSAgICBiYXNlLmhlYWQpCQkJCQlcCj4gLQkJaWYgKChpbnRlbF9wbGFuZSktPnBp cGUgPT0gKGludGVsX2NydGMpLT5waXBlKQo+ICsJCWZvcl9lYWNoX2lmICgoaW50ZWxfcGxhbmUp LT5waXBlID09IChpbnRlbF9jcnRjKS0+cGlwZSkKPiAgCj4gICNkZWZpbmUgZm9yX2VhY2hfaW50 ZWxfY3J0YyhkZXYsIGludGVsX2NydGMpIFwKPiAgCWxpc3RfZm9yX2VhY2hfZW50cnkoaW50ZWxf Y3J0YywgJmRldi0+bW9kZV9jb25maWcuY3J0Y19saXN0LCBiYXNlLmhlYWQpCj4gQEAgLTMwMywx NSArMzAzLDE1IEBAIHN0cnVjdCBpOTE1X2hvdHBsdWcgewo+ICAKPiAgI2RlZmluZSBmb3JfZWFj aF9lbmNvZGVyX29uX2NydGMoZGV2LCBfX2NydGMsIGludGVsX2VuY29kZXIpIFwKPiAgCWxpc3Rf Zm9yX2VhY2hfZW50cnkoKGludGVsX2VuY29kZXIpLCAmKGRldiktPm1vZGVfY29uZmlnLmVuY29k ZXJfbGlzdCwgYmFzZS5oZWFkKSBcCj4gLQkJaWYgKChpbnRlbF9lbmNvZGVyKS0+YmFzZS5jcnRj ID09IChfX2NydGMpKQo+ICsJCWZvcl9lYWNoX2lmICgoaW50ZWxfZW5jb2RlciktPmJhc2UuY3J0 YyA9PSAoX19jcnRjKSkKPiAgCj4gICNkZWZpbmUgZm9yX2VhY2hfY29ubmVjdG9yX29uX2VuY29k ZXIoZGV2LCBfX2VuY29kZXIsIGludGVsX2Nvbm5lY3RvcikgXAo+ICAJbGlzdF9mb3JfZWFjaF9l bnRyeSgoaW50ZWxfY29ubmVjdG9yKSwgJihkZXYpLT5tb2RlX2NvbmZpZy5jb25uZWN0b3JfbGlz dCwgYmFzZS5oZWFkKSBcCj4gLQkJaWYgKChpbnRlbF9jb25uZWN0b3IpLT5iYXNlLmVuY29kZXIg PT0gKF9fZW5jb2RlcikpCj4gKwkJZm9yX2VhY2hfaWYgKChpbnRlbF9jb25uZWN0b3IpLT5iYXNl LmVuY29kZXIgPT0gKF9fZW5jb2RlcikpCj4gIAo+ICAjZGVmaW5lIGZvcl9lYWNoX3Bvd2VyX2Rv bWFpbihkb21haW4sIG1hc2spCQkJCVwKPiAgCWZvciAoKGRvbWFpbikgPSAwOyAoZG9tYWluKSA8 IFBPV0VSX0RPTUFJTl9OVU07IChkb21haW4pKyspCVwKPiAtCQlpZiAoKDEgPDwgKGRvbWFpbikp ICYgKG1hc2spKQo+ICsJCWZvcl9lYWNoX2lmICgoMSA8PCAoZG9tYWluKSkgJiAobWFzaykpCj4g IAo+ICBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZTsKPiAgc3RydWN0IGk5MTVfbW1fc3RydWN0Owo+ IEBAIC03MzAsNyArNzMwLDcgQEAgc3RydWN0IGludGVsX3VuY29yZSB7Cj4gIAlmb3IgKChpX18p ID0gMCwgKGRvbWFpbl9fKSA9ICYoZGV2X3ByaXZfXyktPnVuY29yZS5md19kb21haW5bMF07IFwK PiAgCSAgICAgKGlfXykgPCBGV19ET01BSU5fSURfQ09VTlQ7IFwKPiAgCSAgICAgKGlfXykrKywg KGRvbWFpbl9fKSA9ICYoZGV2X3ByaXZfXyktPnVuY29yZS5md19kb21haW5baV9fXSkgXAo+IC0J CWlmICgoKG1hc2tfXykgJiAoZGV2X3ByaXZfXyktPnVuY29yZS5md19kb21haW5zKSAmICgxIDw8 IChpX18pKSkKPiArCQlmb3JfZWFjaF9pZiAoKChtYXNrX18pICYgKGRldl9wcml2X18pLT51bmNv cmUuZndfZG9tYWlucykgJiAoMSA8PCAoaV9fKSkpCj4gIAo+ICAjZGVmaW5lIGZvcl9lYWNoX2Z3 X2RvbWFpbihkb21haW5fXywgZGV2X3ByaXZfXywgaV9fKSBcCj4gIAlmb3JfZWFjaF9md19kb21h aW5fbWFzayhkb21haW5fXywgRk9SQ0VXQUtFX0FMTCwgZGV2X3ByaXZfXywgaV9fKQo+IEBAIC0x OTY5LDcgKzE5NjksNyBAQCBzdGF0aWMgaW5saW5lIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpn dWNfdG9faTkxNShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCj4gIC8qIEl0ZXJhdGUgb3ZlciBpbml0 aWFsaXNlZCByaW5ncyAqLwo+ICAjZGVmaW5lIGZvcl9lYWNoX3JpbmcocmluZ19fLCBkZXZfcHJp dl9fLCBpX18pIFwKPiAgCWZvciAoKGlfXykgPSAwOyAoaV9fKSA8IEk5MTVfTlVNX1JJTkdTOyAo aV9fKSsrKSBcCj4gLQkJaWYgKCgocmluZ19fKSA9ICYoZGV2X3ByaXZfXyktPnJpbmdbKGlfXyld KSwgaW50ZWxfcmluZ19pbml0aWFsaXplZCgocmluZ19fKSkpCj4gKwkJZm9yX2VhY2hfaWYgKCgo KHJpbmdfXykgPSAmKGRldl9wcml2X18pLT5yaW5nWyhpX18pXSksIGludGVsX3JpbmdfaW5pdGlh bGl6ZWQoKHJpbmdfXykpKSkKPiAgCj4gIGVudW0gaGRtaV9mb3JjZV9hdWRpbyB7Cj4gIAlIRE1J X0FVRElPX09GRl9EVkkgPSAtMiwJLyogbm8gYXV4IGRhdGEgZm9yIEhETUktRFZJIGNvbnZlcnRl ciAqLwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBpbmRleCA3NWYwM2U1YmVl NTEuLjRiMjFkNWUxMzdkYyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK PiBAQCAtMTI0MTcsNyArMTI0MTcsNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9mdXp6eV9jbG9ja19j aGVjayhpbnQgY2xvY2sxLCBpbnQgY2xvY2syKQo+ICAJbGlzdF9mb3JfZWFjaF9lbnRyeSgoaW50 ZWxfY3J0YyksIFwKPiAgCQkJICAgICYoZGV2KS0+bW9kZV9jb25maWcuY3J0Y19saXN0LCBcCj4g IAkJCSAgICBiYXNlLmhlYWQpIFwKPiAtCQlpZiAobWFzayAmICgxIDw8KGludGVsX2NydGMpLT5w aXBlKSkKPiArCQlmb3JfZWFjaF9pZiAobWFzayAmICgxIDw8KGludGVsX2NydGMpLT5waXBlKSkK PiAgCj4gIHN0YXRpYyBib29sCj4gIGludGVsX2NvbXBhcmVfbV9uKHVuc2lnbmVkIGludCBtLCB1 bnNpZ25lZCBpbnQgbiwKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHNpLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuaAo+IGluZGV4IGU2Y2IyNTIz OTk0MS4uMDI1NTFmZjIyOGMyIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RzaS5oCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNpLmgKPiBAQCAt MTE3LDcgKzExNyw3IEBAIHN0YXRpYyBpbmxpbmUgc3RydWN0IGludGVsX2RzaV9ob3N0ICp0b19p bnRlbF9kc2lfaG9zdChzdHJ1Y3QgbWlwaV9kc2lfaG9zdCAqaCkKPiAgCj4gICNkZWZpbmUgZm9y X2VhY2hfZHNpX3BvcnQoX19wb3J0LCBfX3BvcnRzX21hc2spIFwKPiAgCWZvciAoKF9fcG9ydCkg PSBQT1JUX0E7IChfX3BvcnQpIDwgSTkxNV9NQVhfUE9SVFM7IChfX3BvcnQpKyspCVwKPiAtCQlp ZiAoKF9fcG9ydHNfbWFzaykgJiAoMSA8PCAoX19wb3J0KSkpCj4gKwkJZm9yX2VhY2hfaWYgKChf X3BvcnRzX21hc2spICYgKDEgPDwgKF9fcG9ydCkpKQo+ICAKPiAgc3RhdGljIGlubGluZSBzdHJ1 Y3QgaW50ZWxfZHNpICplbmNfdG9faW50ZWxfZHNpKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2Rl cikKPiAgewo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1l X3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKPiBpbmRleCAz ZmE0M2FmOTQ5NDYuLjQ2OTkyN2VkZjQ1OSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ydW50aW1lX3BtLmMKPiBAQCAtNTQsMTMgKzU0LDEzIEBACj4gIAkgICAgIGkgPCAocG93ZXJf ZG9tYWlucyktPnBvd2VyX3dlbGxfY291bnQgJiYJCQlcCj4gIAkJICgocG93ZXJfd2VsbCkgPSAm KHBvd2VyX2RvbWFpbnMpLT5wb3dlcl93ZWxsc1tpXSk7CVwKPiAgCSAgICAgaSsrKQkJCQkJCQlc Cj4gLQkJaWYgKChwb3dlcl93ZWxsKS0+ZG9tYWlucyAmIChkb21haW5fbWFzaykpCj4gKwkJZm9y X2VhY2hfaWYgKChwb3dlcl93ZWxsKS0+ZG9tYWlucyAmIChkb21haW5fbWFzaykpCj4gIAo+ICAj ZGVmaW5lIGZvcl9lYWNoX3Bvd2VyX3dlbGxfcmV2KGksIHBvd2VyX3dlbGwsIGRvbWFpbl9tYXNr LCBwb3dlcl9kb21haW5zKSBcCj4gIAlmb3IgKGkgPSAocG93ZXJfZG9tYWlucyktPnBvd2VyX3dl bGxfY291bnQgLSAxOwkJCSBcCj4gIAkgICAgIGkgPj0gMCAmJiAoKHBvd2VyX3dlbGwpID0gJihw b3dlcl9kb21haW5zKS0+cG93ZXJfd2VsbHNbaV0pO1wKPiAgCSAgICAgaS0tKQkJCQkJCQkgXAo+ IC0JCWlmICgocG93ZXJfd2VsbCktPmRvbWFpbnMgJiAoZG9tYWluX21hc2spKQo+ICsJCWZvcl9l YWNoX2lmICgocG93ZXJfd2VsbCktPmRvbWFpbnMgJiAoZG9tYWluX21hc2spKQo+ICAKPiAgYm9v bCBpbnRlbF9kaXNwbGF5X3Bvd2VyX3dlbGxfaXNfZW5hYmxlZChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCj4gIAkJCQkgICAgaW50IHBvd2VyX3dlbGxfaWQpOwo+IC0tIAo+IDIu MS40Cj4gCgotLSAKRGFuaWVsIFZldHRlcgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9y YXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK