From patchwork Fri Aug 12 02:48:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Kent X-Patchwork-Id: 9276255 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BC2146022E for ; Fri, 12 Aug 2016 02:50:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF2CC28809 for ; Fri, 12 Aug 2016 02:50:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A40E52880B; Fri, 12 Aug 2016 02:50:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 717F428809 for ; Fri, 12 Aug 2016 02:50:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752669AbcHLCs0 (ORCPT ); Thu, 11 Aug 2016 22:48:26 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:43092 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752495AbcHLCsY (ORCPT ); Thu, 11 Aug 2016 22:48:24 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 345EC20345; Thu, 11 Aug 2016 22:48:18 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute7.internal (MEProxy); Thu, 11 Aug 2016 22:48:18 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=themaw.net; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=q9VXWd9iPisb6v0mJsUjTgw3+E4=; b=vfh64A A3IFJZErOP4vwMQvsTclsabPpHLr+LrtZL6/rO9603uokAkqFXWOIpKpOyn0KlkD A1CCqTcDcBdVTVwY6DzqmkTm+zRAOpCcXne4EdM4mkHseDyhL8PQxv1muFaLIY24 hH9I+H5kLQzeSNsIE1kVChHfBw24aZpgIMIo4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=q9VXWd9iPisb6v0 mJsUjTgw3+E4=; b=D1iW+HXy2/kHcc1QdyhnH4Fzk3vQhpSmL46Johbmaq2/Oze yOe3ZtW1JMumZQLllQXRm8Y220vUme8PsHt9kBK+UtT5uGx3kbq93GhYUPxPiydg 959VjkFHHSG6obh+oRS+TWQaVjPo9++9GG2r4aO0fFGcZkUFvBI5TozcZRss= X-Sasl-enc: d8bPo/f6AFWSRwML0BSdnUKb+U7Lef/yUf0fN8fBq33W 1470970097 Received: from pluto.themaw.net (58-7-183-14.dyn.iinet.net.au [58.7.183.14]) by mail.messagingengine.com (Postfix) with ESMTPA id A400BF29D9; Thu, 11 Aug 2016 22:48:17 -0400 (EDT) Received: from pluto.themaw.net (localhost [127.0.0.1]) by pluto.themaw.net (Postfix) with ESMTP id A53DAA0078; Fri, 12 Aug 2016 10:48:15 +0800 (AWST) Subject: [PATCH 09/18] autofs: Don't fail to free_dev_ioctl(param) From: Ian Kent To: Andrew Morton Cc: linux-fsdevel , Tomohiro Kusumi , autofs mailing list , Kernel Mailing List Date: Fri, 12 Aug 2016 10:48:15 +0800 Message-ID: <20160812024815.12352.69153.stgit@pluto.themaw.net> In-Reply-To: <20160812024734.12352.17122.stgit@pluto.themaw.net> References: <20160812024734.12352.17122.stgit@pluto.themaw.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tomohiro Kusumi Returning -ENOTTY here fails to free dynamically allocated param. Signed-off-by: Tomohiro Kusumi Signed-off-by: Ian Kent --- fs/autofs4/dev-ioctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c index c7fcc74..d47b35a 100644 --- a/fs/autofs4/dev-ioctl.c +++ b/fs/autofs4/dev-ioctl.c @@ -662,7 +662,8 @@ static int _autofs_dev_ioctl(unsigned int command, fn = lookup_dev_ioctl(cmd); if (!fn) { pr_warn("unknown command 0x%08x\n", command); - return -ENOTTY; + err = -ENOTTY; + goto out; } fp = NULL;