From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: [PATCH 1/2] drm: fix potential dangling else problems in for_each_ macros Date: Tue, 24 Nov 2015 21:21:55 +0200 Message-ID: <1448392916-2281-1-git-send-email-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, David Herrmann List-Id: intel-gfx@lists.freedesktop.org V2UgaGF2ZSBzZXJpb3VzIGRhbmdsaW5nIGVsc2UgYnVncyB3YWl0aW5nIHRvIGhhcHBlbiBpbiBv dXIgZm9yX2VhY2hfCnN0eWxlIG1hY3JvcyB3aXRoIGlmcy4gQ29uc2lkZXIsIGZvciBleGFtcGxl LAoKICNkZWZpbmUgZHJtX2Zvcl9lYWNoX3BsYW5lX21hc2socGxhbmUsIGRldiwgcGxhbmVfbWFz aykgXAogICAgICAgICBsaXN0X2Zvcl9lYWNoX2VudHJ5KChwbGFuZSksICYoZGV2KS0+bW9kZV9j b25maWcucGxhbmVfbGlzdCwgaGVhZCkgXAogICAgICAgICAgICAgICAgIGlmICgocGxhbmVfbWFz aykgJiAoMSA8PCBkcm1fcGxhbmVfaW5kZXgocGxhbmUpKSkKCklmIHRoaXMgaXMgdXNlZCBpbiBj b250ZXh0OgoKCWlmIChjb25kaXRpb24pCgkJZHJtX2Zvcl9lYWNoX3BsYW5lX21hc2socGxhbmUs IGRldiwgcGxhbmVfbWFzayk7CgllbHNlCgkJZm9vKCk7Cgpmb28oKSB3aWxsIGJlIGNhbGxlZCBm b3IgZWFjaCBwbGFuZSAqbm90KiBpbiBwbGFuZV9tYXNrLCBpZiBjb25kaXRpb24KaG9sZHMsIGFu ZCBub3QgYXQgYWxsIGlmIGNvbmRpdGlvbiBkb2Vzbid0IGhvbGQuCgpGaXggdGhpcyBieSByZXZl cnNpbmcgdGhlIGNvbmRpdGlvbnMgaW4gdGhlIG1hY3JvcywgYW5kIGFkZGluZyBhbiBlbHNlCmJy YW5jaCBmb3IgdGhlICJmb3IgZWFjaCIgYmxvY2ssIHNvIHRoYXQgb3RoZXIgaWYvZWxzZSBibG9j a3MgY2FuJ3QKaW50ZXJmZXJlLiBQcm92aWRlIGEgImZvcl9lYWNoX2lmIiBoZWxwZXIgbWFjcm8g dG8gbWFrZSBpdCBlYXNpZXIgdG8gZ2V0CnRoaXMgcmlnaHQuCgpTaWduZWQtb2ZmLWJ5OiBKYW5p IE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgotLS0KIGluY2x1ZGUvZHJtL2RybVAuaCAg ICAgICB8IDMgKysrCiBpbmNsdWRlL2RybS9kcm1fYXRvbWljLmggfCA2ICsrKy0tLQogaW5jbHVk ZS9kcm0vZHJtX2NydGMuaCAgIHwgNCArKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDggaW5zZXJ0aW9u cygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1QLmggYi9p bmNsdWRlL2RybS9kcm1QLmgKaW5kZXggMGI5MjFhZTA2Y2Q4Li4zMGQ0YTVhNDk1ZTIgMTAwNjQ0 Ci0tLSBhL2luY2x1ZGUvZHJtL2RybVAuaAorKysgYi9pbmNsdWRlL2RybS9kcm1QLmgKQEAgLTEx MTEsNCArMTExMSw3IEBAIHN0YXRpYyBfX2lubGluZV9fIGJvb2wgZHJtX2Nhbl9zbGVlcCh2b2lk KQogCXJldHVybiB0cnVlOwogfQogCisvKiBoZWxwZXIgZm9yIGhhbmRsaW5nIGNvbmRpdGlvbmFs cyBpbiB2YXJpb3VzIGZvcl9lYWNoIG1hY3JvcyAqLworI2RlZmluZSBmb3JfZWFjaF9pZihjb25k aXRpb24pIGlmICghKGNvbmRpdGlvbikpIHt9IGVsc2UKKwogI2VuZGlmCmRpZmYgLS1naXQgYS9p bmNsdWRlL2RybS9kcm1fYXRvbWljLmggYi9pbmNsdWRlL2RybS9kcm1fYXRvbWljLmgKaW5kZXgg NGI3NGM5N2QyOTdhLi5kODU3NmFjNTU2OTMgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9h dG9taWMuaAorKysgYi9pbmNsdWRlL2RybS9kcm1fYXRvbWljLmgKQEAgLTE0OSw3ICsxNDksNyBA QCBpbnQgX19tdXN0X2NoZWNrIGRybV9hdG9taWNfYXN5bmNfY29tbWl0KHN0cnVjdCBkcm1fYXRv bWljX3N0YXRlICpzdGF0ZSk7CiAJICAgICAoKGNvbm5lY3RvcikgPSAoc3RhdGUpLT5jb25uZWN0 b3JzW19faV0sCQkJXAogCSAgICAgKGNvbm5lY3Rvcl9zdGF0ZSkgPSAoc3RhdGUpLT5jb25uZWN0 b3Jfc3RhdGVzW19faV0sIDEpOyAJXAogCSAgICAgKF9faSkrKykJCQkJCQkJXAotCQlpZiAoY29u bmVjdG9yKQorCQlmb3JfZWFjaF9pZiAoY29ubmVjdG9yKQogCiAjZGVmaW5lIGZvcl9lYWNoX2Ny dGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIF9faSkJXAogCWZvciAoKF9faSkg PSAwOwkJCQkJCVwKQEAgLTE1Nyw3ICsxNTcsNyBAQCBpbnQgX19tdXN0X2NoZWNrIGRybV9hdG9t aWNfYXN5bmNfY29tbWl0KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7CiAJICAgICAo KGNydGMpID0gKHN0YXRlKS0+Y3J0Y3NbX19pXSwJCQlcCiAJICAgICAoY3J0Y19zdGF0ZSkgPSAo c3RhdGUpLT5jcnRjX3N0YXRlc1tfX2ldLCAxKTsJXAogCSAgICAgKF9faSkrKykJCQkJCQlcCi0J CWlmIChjcnRjX3N0YXRlKQorCQlmb3JfZWFjaF9pZiAoY3J0Y19zdGF0ZSkKIAogI2RlZmluZSBm b3JfZWFjaF9wbGFuZV9pbl9zdGF0ZShzdGF0ZSwgcGxhbmUsIHBsYW5lX3N0YXRlLCBfX2kpCQlc CiAJZm9yICgoX19pKSA9IDA7CQkJCQkJCVwKQEAgLTE2NSw3ICsxNjUsNyBAQCBpbnQgX19tdXN0 X2NoZWNrIGRybV9hdG9taWNfYXN5bmNfY29tbWl0KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz dGF0ZSk7CiAJICAgICAoKHBsYW5lKSA9IChzdGF0ZSktPnBsYW5lc1tfX2ldLAkJCQlcCiAJICAg ICAocGxhbmVfc3RhdGUpID0gKHN0YXRlKS0+cGxhbmVfc3RhdGVzW19faV0sIDEpOwkJXAogCSAg ICAgKF9faSkrKykJCQkJCQkJXAotCQlpZiAocGxhbmVfc3RhdGUpCisJCWZvcl9lYWNoX2lmIChw bGFuZV9zdGF0ZSkKIHN0YXRpYyBpbmxpbmUgYm9vbAogZHJtX2F0b21pY19jcnRjX25lZWRzX21v ZGVzZXQoc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSkKIHsKZGlmZiAtLWdpdCBhL2luY2x1 ZGUvZHJtL2RybV9jcnRjLmggYi9pbmNsdWRlL2RybS9kcm1fY3J0Yy5oCmluZGV4IDE3MzUzNWEz NWQ2NS4uNDc2NWRmMzMxMDAyIDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9kcm1fY3J0Yy5oCisr KyBiL2luY2x1ZGUvZHJtL2RybV9jcnRjLmgKQEAgLTExNzAsNyArMTE3MCw3IEBAIHN0cnVjdCBk cm1fbW9kZV9jb25maWcgewogICovCiAjZGVmaW5lIGRybV9mb3JfZWFjaF9wbGFuZV9tYXNrKHBs YW5lLCBkZXYsIHBsYW5lX21hc2spIFwKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KChwbGFuZSksICYo ZGV2KS0+bW9kZV9jb25maWcucGxhbmVfbGlzdCwgaGVhZCkgXAotCQlpZiAoKHBsYW5lX21hc2sp ICYgKDEgPDwgZHJtX3BsYW5lX2luZGV4KHBsYW5lKSkpCisJCWZvcl9lYWNoX2lmICgocGxhbmVf bWFzaykgJiAoMSA8PCBkcm1fcGxhbmVfaW5kZXgocGxhbmUpKSkKIAogCiAjZGVmaW5lIG9ial90 b19jcnRjKHgpIGNvbnRhaW5lcl9vZih4LCBzdHJ1Y3QgZHJtX2NydGMsIGJhc2UpCkBAIC0xNTQ3 LDcgKzE1NDcsNyBAQCBzdGF0aWMgaW5saW5lIHN0cnVjdCBkcm1fcHJvcGVydHkgKmRybV9wcm9w ZXJ0eV9maW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAvKiBQbGFuZSBsaXN0IGl0ZXJhdG9y IGZvciBsZWdhY3kgKG92ZXJsYXkgb25seSkgcGxhbmVzLiAqLwogI2RlZmluZSBkcm1fZm9yX2Vh Y2hfbGVnYWN5X3BsYW5lKHBsYW5lLCBkZXYpIFwKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHBsYW5l LCAmKGRldiktPm1vZGVfY29uZmlnLnBsYW5lX2xpc3QsIGhlYWQpIFwKLQkJaWYgKHBsYW5lLT50 eXBlID09IERSTV9QTEFORV9UWVBFX09WRVJMQVkpCisJCWZvcl9lYWNoX2lmIChwbGFuZS0+dHlw ZSA9PSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZKQogCiAjZGVmaW5lIGRybV9mb3JfZWFjaF9wbGFu ZShwbGFuZSwgZGV2KSBcCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShwbGFuZSwgJihkZXYpLT5tb2Rl X2NvbmZpZy5wbGFuZV9saXN0LCBoZWFkKQotLSAKMi4xLjQKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==