From patchwork Mon Apr 13 08:32:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonyoung Shim X-Patchwork-Id: 6206551 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4452EBF4A6 for ; Mon, 13 Apr 2015 08:32:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7E0182021F for ; Mon, 13 Apr 2015 08:32:20 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id ADDDA201F2 for ; Mon, 13 Apr 2015 08:32:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D258A6E250; Mon, 13 Apr 2015 01:32:18 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by gabe.freedesktop.org (Postfix) with ESMTP id 4393A6E265 for ; Mon, 13 Apr 2015 01:32:17 -0700 (PDT) Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NMQ002DUL1EYR80@mailout4.samsung.com> for dri-devel@lists.freedesktop.org; Mon, 13 Apr 2015 17:32:02 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.112]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 75.B9.18889.10F7B255; Mon, 13 Apr 2015 17:32:01 +0900 (KST) X-AuditID: cbfee68d-f79266d0000049c9-0a-552b7f018663 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 13.30.25346.10F7B255; Mon, 13 Apr 2015 17:32:01 +0900 (KST) Received: from localhost.localdomain ([10.252.81.123]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NMQ00FR6L1DR700@mmp1.samsung.com>; Mon, 13 Apr 2015 17:32:01 +0900 (KST) From: Joonyoung Shim To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm 1/5] modetest: fix Segmentation fault Date: Mon, 13 Apr 2015 17:32:14 +0900 Message-id: <1428913938-5850-1-git-send-email-jy0922.shim@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCLMWRmVeSWpSXmKPExsWyRsSkQJexXjvU4NArXYsrX9+zWey5eo/J 4sW9iywOzB47Z91l97jffZzJo2/LKsYA5igum5TUnMyy1CJ9uwSujCedf5kKJnJULPn+mr2B 8RJbFyMnh4SAiUT3o2nMELaYxIV764HiXBxCAksZJT6u72eBKTr5+SFYg5DAIkaJs7/1IOwf jBJfFvKC2GwCehJ3th1nArFFBJQl/k5cxQhiMwuYSjTdPAhmCwvYSExoWwQ2k0VAVeJX63Kw OK+Am8Sx7+tYIXbJSZw8NhnKPsEmceMAK0S9gMS3yYeAejmA4rISmw5A3SwpcXDFDZYJjIIL GBlWMYqmFiQXFCelFxnqFSfmFpfmpesl5+duYgQG3ul/z3p3MN4+YH2IUYCDUYmH98IdrVAh 1sSy4srcQ4ymQBsmMkuJJucDwzuvJN7Q2MzIwtTE1NjI3NJMSZxXUepnsJBAemJJanZqakFq UXxRaU5q8SFGJg5OqQbGo7ZRN8s2dJ25bvMgp0Qn/4hBzZRfesYsLTc6OaS2CGrm3Ai/O0mc v72sdfsN79vGHy61zdP+9WSHQdAk2cxl04sjSiffZROfuGq56fZbf3n0DKM/OR0OnB68xq50 /2xV7dBlfad9DsWu32st+e+5y4boE3uNHIWfTb/PuK/npoz47GqBypkpSizFGYmGWsxFxYkA PQiEZDcCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPLMWRmVeSWpSXmKPExsVy+t9jAV3Geu1Qg9U31SyufH3PZrHn6j0m ixf3LrI4MHvsnHWX3eN+93Emj74tqxgDmKMaGG0yUhNTUosUUvOS81My89JtlbyD453jTc0M DHUNLS3MlRTyEnNTbZVcfAJ03TJzgFYpKZQl5pQChQISi4uV9O0wTQgNcdO1gGmM0PUNCYLr MTJAAwlrGDOedP5lKpjIUbHk+2v2BsZLbF2MnBwSAiYSJz8/hLLFJC7cWw9mCwksYpQ4+1sP wv7BKPFlIS+IzSagJ3Fn23EmEFtEQFni78RVjCA2s4CpRNPNg2C2sICNxIS2RSwgNouAqsSv 1uVgcV4BN4lj39exQuySkzh5bDLrBEbuBYwMqxhFUwuSC4qT0nMN9YoTc4tL89L1kvNzNzGC A/uZ1A7GlQ0WhxgFOBiVeHgv3NEKFWJNLCuuzD3EKMHBrCTCW5epHSrEm5JYWZValB9fVJqT WnyI0RRo+0RmKdHkfGDU5ZXEGxqbmBlZGpkbWhgZmyuJ887RlQsVEkhPLEnNTk0tSC2C6WPi 4JRqYNTfn+J+rfhx792N81bpaz2OYF8rLtL9Ufav0/ysyrOmMRdrH7RUXy3fa7jn4VmRS1Nn c197Fuk2SyDCvz6x8tBJ+40Xdx3snqd5b5VhTZIcR+onxSkTeG3+7t+d8ejuL6PMD4rFWUmd FgZinKLFr3IStjKtjJ1q6s3MEasfkmt90b59ne69dCWW4oxEQy3mouJEAMUJ4WOCAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: emil.l.velikov@gmail.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If use -P option without -s option, we meet Segmentation fault error when modetest is terminated. Check whether dev.mode.bo is NULL. Signed-off-by: Joonyoung Shim --- tests/modetest/modetest.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c index 5f46efd..b59f6b5 100644 --- a/tests/modetest/modetest.c +++ b/tests/modetest/modetest.c @@ -1113,6 +1113,12 @@ static void set_mode(struct device *dev, struct pipe_arg *pipes, unsigned int co dev->mode.fb_id = fb_id; } +static void clear_mode(struct device *dev) +{ + if (dev->mode.bo) + bo_destroy(dev->mode.bo); +} + static void set_planes(struct device *dev, struct plane_arg *p, unsigned int count) { unsigned int i; @@ -1636,7 +1642,8 @@ int main(int argc, char **argv) if (test_cursor) clear_cursors(&dev); - bo_destroy(dev.mode.bo); + if (count) + clear_mode(&dev); } free_resources(dev.resources);