From patchwork Tue Jun 12 06:05:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 928110 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="BLKD4l2S"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 414fcX4r7lz9s1R for ; Tue, 12 Jun 2018 16:10:04 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 424A5C21E44; Tue, 12 Jun 2018 06:08:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 11054C21E73; Tue, 12 Jun 2018 06:06:14 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A8891C21DCA; Tue, 12 Jun 2018 06:05:43 +0000 (UTC) Received: from mail-io0-f194.google.com (mail-io0-f194.google.com [209.85.223.194]) by lists.denx.de (Postfix) with ESMTPS id 44758C21E30 for ; Tue, 12 Jun 2018 06:05:40 +0000 (UTC) Received: by mail-io0-f194.google.com with SMTP id g7-v6so26671010ioh.11 for ; Mon, 11 Jun 2018 23:05:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Y8lvE8QnKSbvspXrsw8wfLvDM25yQ3vYVW8RnVCiSgE=; b=BLKD4l2S6s1voMo/wuKczzATzI01Sfwv4b0t6NStMED9DuqHtwTjtJ/kHAbmyyjRe5 u+5NAjcBdzggK2s8OTKnj1iDJeaO1iKF92twqxS+efEZQXxYft106UziuHeIOAEK/FlR C9PXb9EKhuwW95EslVddy8He4PrRACr2B/OsYeNIgjgBoc32WRCx3vjoz6aTlq1+CE1P CDxIqYL25xe+m8+4XrssoT5NbpaAZMXc2HEXCkmy4ORI1S8/oQZSQ0+IV6TlEmdF1Y45 s5PeHsgrBr/i7PmarNzYpFf7PlUho8DCPcty1MVYoSsnZZNwbqR44n1WlFmaEmbDnZmY X61w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Y8lvE8QnKSbvspXrsw8wfLvDM25yQ3vYVW8RnVCiSgE=; b=lmYTpxiLZtT8TUjecFftthUBZ5wZEGwNXSCcQeQWFydNymEspGovwGcAS2q06EkdjB SY7LXjY+oU3fQMZlnTU5Z7Lxsmdj9aoCsOCWhK8gkQ59WuAD2C3GWd9jI0BOpBSWbtsV 2AMyV3VqSJO9dBqki1ilDZbh4/sP0g94iriwIWyr5X0AMCg6Bdwh48ourx9ZhuI+tNsn P48T4frHL/JE5QszsA+NNUdNQPzcu9VZ0yvJlQ26mGNayssQReo52zzLg+VO3oHOHaNi TKM0AHi7qDjNvQwDb6I4cC9opMTsC4i8xgQegXZ7iOl+3auV6kZnVmXXdq1I5jTK5mJW /l0g== X-Gm-Message-State: APt69E3SuJUlcCh1nW7APTNunjJexuNcwvv2A160V1/qHC7xBiegwBUk 5CX/7e6Q4zqekvxsfhxZeaVJ8A== X-Google-Smtp-Source: ADUXVKL5+hYtGSrcm6ivp/EDIRgB0tEhfKSxppSr3zTyWRcrgNDRJdAvDbtsiR6SDmnLRzYyza1imw== X-Received: by 2002:a6b:290a:: with SMTP id p10-v6mr2003755iop.1.1528783538671; Mon, 11 Jun 2018 23:05:38 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([100.67.80.24]) by smtp.gmail.com with ESMTPSA id n190-v6sm148104ith.27.2018.06.11.23.05.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Jun 2018 23:05:37 -0700 (PDT) Received: by kiwi.bld.corp.google.com (Postfix, from userid 121222) id 2073D140129; Tue, 12 Jun 2018 00:05:37 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Tue, 12 Jun 2018 00:05:01 -0600 Message-Id: <20180612060502.196817-8-sjg@chromium.org> X-Mailer: git-send-email 2.18.0.rc1.244.gcf134e6275-goog In-Reply-To: <20180612060502.196817-1-sjg@chromium.org> References: <20180612060502.196817-1-sjg@chromium.org> Cc: Jagan Teki , Heinrich Schuchardt , Tom Rini Subject: [U-Boot] [PATCH v2 7/8] spi: sandbox: Fix memory leak in sandbox_sf_bind_emul() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Move the strdup() call so that it is only done when we know we will bind the device. Reported-by: Coverity (CID: 131216) Signed-off-by: Simon Glass --- Changes in v2: - Fre the string when device_bind() fails, and presumably doesn't need it drivers/mtd/spi/sandbox.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c index 7893efee12..f23c0e13e0 100644 --- a/drivers/mtd/spi/sandbox.c +++ b/drivers/mtd/spi/sandbox.c @@ -567,16 +567,17 @@ int sandbox_sf_bind_emul(struct sandbox_state *state, int busnum, int cs, strncpy(name, spec, sizeof(name) - 6); name[sizeof(name) - 6] = '\0'; strcat(name, "-emul"); - str = strdup(name); - if (!str) - return -ENOMEM; drv = lists_driver_lookup_name("sandbox_sf_emul"); if (!drv) { puts("Cannot find sandbox_sf_emul driver\n"); return -ENOENT; } + str = strdup(name); + if (!str) + return -ENOMEM; ret = device_bind(bus, drv, str, NULL, of_offset, &emul); if (ret) { + free(str); printf("Cannot create emul device for spec '%s' (err=%d)\n", spec, ret); return ret;