{"id":954,"url":"http://patchwork.ozlabs.org/api/1.0/patches/954/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<200809222151.m8MLp1S9031895@imap1.linux-foundation.org>","date":"2008-09-22T21:51:01","name":"[1/4] drivers/isdn/capi/kcapi.c: Adjust error handling code involving capi_ctr_put","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"56984d6a1fb178f2bc64082911ee3dc68a8c960d","submitter":{"id":107,"url":"http://patchwork.ozlabs.org/api/1.0/people/107/?format=json","name":"Andrew Morton","email":"akpm@linux-foundation.org"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/200809222151.m8MLp1S9031895@imap1.linux-foundation.org/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/954/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Received":["from vger.kernel.org (vger.kernel.org [209.132.176.167])\n\tby ozlabs.org (Postfix) with ESMTP id 263F3DDF0F\n\tfor ;\n\tTue, 23 Sep 2008 07:51:51 +1000 (EST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753480AbYIVVvk (ORCPT );\n\tMon, 22 Sep 2008 17:51:40 -0400","(majordomo@vger.kernel.org) by vger.kernel.org id S1753489AbYIVVvk\n\t(ORCPT ); Mon, 22 Sep 2008 17:51:40 -0400","from smtp1.linux-foundation.org ([140.211.169.13]:39608 \"EHLO\n\tsmtp1.linux-foundation.org\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1753465AbYIVVvi (ORCPT\n\t); Mon, 22 Sep 2008 17:51:38 -0400","from imap1.linux-foundation.org (imap1.linux-foundation.org\n\t[140.211.169.55])\n\tby smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with\n\tESMTP id m8MLp2MU018190\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);\n\tMon, 22 Sep 2008 14:51:03 -0700","from localhost.localdomain (localhost [127.0.0.1])\n\tby imap1.linux-foundation.org\n\t(8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id\n\tm8MLp1S9031895; Mon, 22 Sep 2008 14:51:01 -0700"],"Message-Id":"<200809222151.m8MLp1S9031895@imap1.linux-foundation.org>","Subject":"[patch 1/4] drivers/isdn/capi/kcapi.c: Adjust error handling code\n\tinvolving capi_ctr_put","To":"kkeil@suse.de","Cc":"netdev@vger.kernel.org, akpm@linux-foundation.org, julia@diku.dk,\n\tdavem@davemloft.net","From":"akpm@linux-foundation.org","Date":"Mon, 22 Sep 2008 14:51:01 -0700","X-Spam-Status":"No, hits=-3.359 required=5 tests=AWL, BAYES_00,\n\tOSDL_HEADER_SUBJECT_BRACKETED","X-Spam-Checker-Version":"SpamAssassin 3.2.4-osdl_revision__1.47__","X-MIMEDefang-Filter":"lf$Revision: 1.188 $","X-Scanned-By":"MIMEDefang 2.63 on 140.211.169.13","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Julia Lawall \n\nAfter calling capi_ctr_get, error handling code should call capi_ctr_put.\n\nThe semantic match that finds this problem is as follows:\n(http://www.emn.fr/x-info/coccinelle/)\n\n// \n@r@\nexpression x,E;\nstatement S;\nposition p1,p2,p3;\n@@\n\n(\nif ((x = capi_ctr_get@p1(...)) == NULL || ...) S\n|\nx = capi_ctr_get@p1(...)\n... when != x\nif (x == NULL || ...) S\n)\n<...\nif@p3 (...) { ... when != capi_ctr_put(x)\n when != if (x) { ... capi_ctr_put(x); ...}\n return@p2 ...;\n}\n...>\n(\nreturn x;\n|\nreturn 0;\n|\nx = E\n|\nE = x\n|\ncapi_ctr_put(x)\n)\n\n@exists@\nposition r.p1,r.p2,r.p3;\nexpression x;\nint ret != 0;\nstatement S;\n@@\n\n* x = capi_ctr_get@p1(...)\n <...\n* if@p3 (...)\n S\n ...>\n* return@p2 \\(NULL\\|ret\\);\n// \n\nSigned-off-by: Julia Lawall \nCc: Karsten Keil \nCc: \"David S. Miller\" \nSigned-off-by: Andrew Morton \n---\n\n drivers/isdn/capi/kcapi.c | 4 ++++\n 1 file changed, 4 insertions(+)","diff":"diff -puN drivers/isdn/capi/kcapi.c~drivers-isdn-capi-kcapic-adjust-error-handling-code-involving-capi_ctr_put drivers/isdn/capi/kcapi.c\n--- a/drivers/isdn/capi/kcapi.c~drivers-isdn-capi-kcapic-adjust-error-handling-code-involving-capi_ctr_put\n+++ a/drivers/isdn/capi/kcapi.c\n@@ -828,15 +828,18 @@ static int old_capi_manufacturer(unsigne\n \t\t\treturn -ESRCH;\n \t\tif (card->load_firmware == NULL) {\n \t\t\tprintk(KERN_DEBUG \"kcapi: load: no load function\\n\");\n+\t\t\tcapi_ctr_put(card);\n \t\t\treturn -ESRCH;\n \t\t}\n \n \t\tif (ldef.t4file.len <= 0) {\n \t\t\tprintk(KERN_DEBUG \"kcapi: load: invalid parameter: length of t4file is %d ?\\n\", ldef.t4file.len);\n+\t\t\tcapi_ctr_put(card);\n \t\t\treturn -EINVAL;\n \t\t}\n \t\tif (ldef.t4file.data == NULL) {\n \t\t\tprintk(KERN_DEBUG \"kcapi: load: invalid parameter: dataptr is 0\\n\");\n+\t\t\tcapi_ctr_put(card);\n \t\t\treturn -EINVAL;\n \t\t}\n \n@@ -849,6 +852,7 @@ static int old_capi_manufacturer(unsigne\n \n \t\tif (card->cardstate != CARD_DETECTED) {\n \t\t\tprintk(KERN_INFO \"kcapi: load: contr=%d not in detect state\\n\", ldef.contr);\n+\t\t\tcapi_ctr_put(card);\n \t\t\treturn -EBUSY;\n \t\t}\n \t\tcard->cardstate = CARD_LOADING;\n","prefixes":["1/4"]}