From: Thomas Zimmermann Subject: [PATCH, RESEND] drm/vmwgfx: Don't double-free the mode stored in par->set_mode Date: Mon, 18 Mar 2019 15:47:58 +0100 Message-ID: <20190318144758.21267-1-tzimmermann@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 676548928D for ; Mon, 18 Mar 2019 14:48:03 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: thellstrom@vmware.com, linux-graphics-maintainer@vmware.com Cc: Thomas Zimmermann , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org V2hlbiBjYWxsaW5nIHZtd19mYl9zZXRfcGFyKCksIHRoZSBtb2RlIHN0b3JlZCBpbiBwYXItPnNl dF9tb2RlIGdldHMgZnJlZSdkCnR3aWNlLiBUaGUgZmlyc3QgZnJlZSBpcyBpbiB2bXdfZmJfa21z X2RldGFjaCgpLCB0aGUgc2Vjb25kIGlzIG5lYXIgdGhlCmVuZCBvZiB2bXdfZmJfc2V0X3Bhcigp IHVuZGVyIHRoZSBuYW1lIG9mICdvbGRfbW9kZScuIFRoZSBtb2RlLXNldHRpbmcgY29kZQpvbmx5 IHdvcmtzIGNvcnJlY3RseSBpZiB0aGUgbW9kZSBkb2Vzbid0IGFjdHVhbGx5IGNoYW5nZS4gUmVt b3ZpbmcgJ29sZF9tb2RlJwppbiBmYXZvciBvZiB1c2luZyBwYXItPnNldF9tb2RlIGRpcmVjdGx5 IGZpeGVzIHRoZSBwcm9ibGVtLgoKU2lnbmVkLW9mZi1ieTogVGhvbWFzIFppbW1lcm1hbm4gPHR6 aW1tZXJtYW5uQHN1c2UuZGU+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZmIu YyB8IDEyICsrKy0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgOSBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9m Yi5jIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZmIuYwppbmRleCBiOTEzYTU2ZjM0 MjYuLjJhOTExMjUxNWY0NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdn ZnhfZmIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9mYi5jCkBAIC01NjQs MTEgKzU2NCw5IEBAIHN0YXRpYyBpbnQgdm13X2ZiX3NldF9wYXIoc3RydWN0IGZiX2luZm8gKmlu Zm8pCiAJCTAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsCiAJCURSTV9NT0RFX0ZMQUdf TkhTWU5DIHwgRFJNX01PREVfRkxBR19QVlNZTkMpCiAJfTsKLQlzdHJ1Y3QgZHJtX2Rpc3BsYXlf bW9kZSAqb2xkX21vZGU7CiAJc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGU7CiAJaW50IHJl dDsKCi0Jb2xkX21vZGUgPSBwYXItPnNldF9tb2RlOwogCW1vZGUgPSBkcm1fbW9kZV9kdXBsaWNh dGUodm13X3ByaXYtPmRldiwgJm5ld19tb2RlKTsKIAlpZiAoIW1vZGUpIHsKIAkJRFJNX0VSUk9S KCJDb3VsZCBub3QgY3JlYXRlIG5ldyBmYiBtb2RlLlxuIik7CkBAIC01NzksMTEgKzU3Nyw3IEBA IHN0YXRpYyBpbnQgdm13X2ZiX3NldF9wYXIoc3RydWN0IGZiX2luZm8gKmluZm8pCiAJbW9kZS0+ dmRpc3BsYXkgPSB2YXItPnlyZXM7CiAJdm13X2d1ZXNzX21vZGVfdGltaW5nKG1vZGUpOwoKLQlp ZiAob2xkX21vZGUgJiYgZHJtX21vZGVfZXF1YWwob2xkX21vZGUsIG1vZGUpKSB7Ci0JCWRybV9t b2RlX2Rlc3Ryb3kodm13X3ByaXYtPmRldiwgbW9kZSk7Ci0JCW1vZGUgPSBvbGRfbW9kZTsKLQkJ b2xkX21vZGUgPSBOVUxMOwotCX0gZWxzZSBpZiAoIXZtd19rbXNfdmFsaWRhdGVfbW9kZV92cmFt KHZtd19wcml2LAorCWlmICghdm13X2ttc192YWxpZGF0ZV9tb2RlX3ZyYW0odm13X3ByaXYsCiAJ CQkJCW1vZGUtPmhkaXNwbGF5ICoKIAkJCQkJRElWX1JPVU5EX1VQKHZhci0+Yml0c19wZXJfcGl4 ZWwsIDgpLAogCQkJCQltb2RlLT52ZGlzcGxheSkpIHsKQEAgLTYyMCw4ICs2MTQsOCBAQCBzdGF0 aWMgaW50IHZtd19mYl9zZXRfcGFyKHN0cnVjdCBmYl9pbmZvICppbmZvKQogCXNjaGVkdWxlX2Rl bGF5ZWRfd29yaygmcGFyLT5sb2NhbF93b3JrLCAwKTsKCiBvdXRfdW5sb2NrOgotCWlmIChvbGRf bW9kZSkKLQkJZHJtX21vZGVfZGVzdHJveSh2bXdfcHJpdi0+ZGV2LCBvbGRfbW9kZSk7CisJaWYg KHBhci0+c2V0X21vZGUpCisJCWRybV9tb2RlX2Rlc3Ryb3kodm13X3ByaXYtPmRldiwgcGFyLT5z ZXRfbW9kZSk7CiAJcGFyLT5zZXRfbW9kZSA9IG1vZGU7CgogCW11dGV4X3VubG9jaygmcGFyLT5i b19tdXRleCk7Ci0tCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVs