From patchwork Wed Sep 2 20:26:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 291870 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1F35C433E7 for ; Wed, 2 Sep 2020 20:28:03 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 46D1920678 for ; Wed, 2 Sep 2020 20:28:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="PaU1KQ8C"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HNLI4KI4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 46D1920678 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id D6C371824; Wed, 2 Sep 2020 22:27:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D6C371824 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1599078481; bh=L3zaxyNYFnNaorZ6kS5aJ3wM3xWqEV8ZcXGXyNe8/fg=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=PaU1KQ8CLkVMkqFiH6KtrxL6YzptGW4SRiifVvfJJ7K7Gv2p4oLWZ+PgX7YKJTI1b E4J36ikBr5hXghW5Yqet5l1Uxm6Ja6+G9ZMy9uoE+QiqecuXveuisOq5c1dKL7BzIH z34iIp/2OPM9rz0Hv1peQOUqH1pSmAW2BkOIkqiY= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 74077F800BA; Wed, 2 Sep 2020 22:27:11 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D5BCCF8024A; Wed, 2 Sep 2020 22:27:09 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id AE568F800BA for ; Wed, 2 Sep 2020 22:26:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AE568F800BA Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HNLI4KI4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599078418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type; bh=cIAL4uSFyLFSVcItg2mcli0KRxTiY1/Wt15t2VmCv+8=; b=HNLI4KI4ekZ1qXm4+iCvXOmIlQAhIVm46V60x5gUZULJc+qtXvP06oK1aEjw9qye7P+M7m QbGjAvPcHjDd1lxcYefN3lNfc81JOtemwdm8slsj3ZvlRYgoXKlSANp7XmcCz9ELxzJMEV r73amXjzEhhrDbEMhe4Hh4PsKsArH7U= Received: from mail-il1-f197.google.com (mail-il1-f197.google.com [209.85.166.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-385-kjLQvaTYPNO8Md96fG-VBA-1; Wed, 02 Sep 2020 16:26:56 -0400 X-MC-Unique: kjLQvaTYPNO8Md96fG-VBA-1 Received: by mail-il1-f197.google.com with SMTP id w82so605908ila.23 for ; Wed, 02 Sep 2020 13:26:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=cIAL4uSFyLFSVcItg2mcli0KRxTiY1/Wt15t2VmCv+8=; b=R7YUWkJdq4lJ49u4RsLhasYPSsducdZcQAtl2g3La5gmu/+b2eJbZqNV6N0cDOrqNK Z8cpGKvJIV6nwWJgoQwo3amlufl5pkEY+JVwvH0GY8kGjPzv8eyJHx220lksIGLHX2OM Ir4vAc+7eJYFzmqcDHkXIYOx66rJshtl+Gob0J2CTFGrJfkhSyPbfpcs9Xow88XpW2Y0 AUZDaNFLzKYy9m0o/z4rcqeT/avRuN1DKFu48/1ySHm1BP5CmHOZgvodZlkxFuI/j5BL SuS+iPq6jzOF+urph2mB5nH2aYeLFzcdl2LOostP/ze3qkOXS/j8H6rWs42Wg0MiDN9e 69yw== X-Gm-Message-State: AOAM530pPY82X8WzK6PfhrVAsq4oLBPAXjYESOck7F4xzoG50a56cOJs U6YbhK3A6UW2keUJ8fEn2xUug/J7NRWTSBUVPoLUfapeNBn9cA/MmSVL6Nfgb7/MKUzXnSVou6R kG+uUQVO3A3XA0LYWWw03cA8= X-Received: by 2002:a92:a1d4:: with SMTP id b81mr19934ill.152.1599078415905; Wed, 02 Sep 2020 13:26:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyA12e2y880FIcVpufJTfqjLja+2TIGbXlSF6n0WsreiuRt2D1J+eMlzyCBT8LQ2F8+uVeYPg== X-Received: by 2002:a92:a1d4:: with SMTP id b81mr19902ill.152.1599078415553; Wed, 02 Sep 2020 13:26:55 -0700 (PDT) Received: from trix.remote.csb (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id i73sm330622ill.4.2020.09.02.13.26.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 13:26:55 -0700 (PDT) From: trix@redhat.com To: vkoul@kernel.org, yung-chuan.liao@linux.intel.com, pierre-louis.bossart@linux.intel.com, sanyog.r.kale@intel.com, natechancellor@gmail.com, ndesaulniers@google.com, shreyas.nc@intel.com Subject: [PATCH v2] soundwire: fix double free of dangling pointer Date: Wed, 2 Sep 2020 13:26:50 -0700 Message-Id: <20200902202650.14189-1-trix@redhat.com> X-Mailer: git-send-email 2.18.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=trix@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Cc: clang-built-linux@googlegroups.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Tom Rix X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Tom Rix clang static analysis flags this problem stream.c:844:9: warning: Use of memory after it is freed kfree(bus->defer_msg.msg->buf); ^~~~~~~~~~~~~~~~~~~~~~~ This happens in an error handler cleaning up memory allocated for elements in a list. list_for_each_entry(m_rt, &stream->master_list, stream_node) { bus = m_rt->bus; kfree(bus->defer_msg.msg->buf); kfree(bus->defer_msg.msg); } And is triggered when the call to sdw_bank_switch() fails. There are a two problems. First, when sdw_bank_switch() fails, though it frees memory it does not clear bus's reference 'defer_msg.msg' to that memory. The second problem is the freeing msg->buf. In some cases msg will be NULL so this will dereference a null pointer. Need to check before freeing. Fixes: 99b8a5d608a6 ("soundwire: Add bank switch routine") Signed-off-by: Tom Rix Reviewed-by: Nick Desaulniers Reviewed-by: Pierre-Louis Bossart --- v2 : change title, was 'soundwire: fix error handling' --- drivers/soundwire/stream.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index 37290a799023..6e36deb505b1 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -717,6 +717,7 @@ static int sdw_bank_switch(struct sdw_bus *bus, int m_rt_count) kfree(wbuf); error_1: kfree(wr_msg); + bus->defer_msg.msg = NULL; return ret; } @@ -840,9 +841,10 @@ static int do_bank_switch(struct sdw_stream_runtime *stream) error: list_for_each_entry(m_rt, &stream->master_list, stream_node) { bus = m_rt->bus; - - kfree(bus->defer_msg.msg->buf); - kfree(bus->defer_msg.msg); + if (bus->defer_msg.msg) { + kfree(bus->defer_msg.msg->buf); + kfree(bus->defer_msg.msg); + } } msg_unlock: