From patchwork Thu Sep 20 01:09:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 147068 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1355578ljw; Wed, 19 Sep 2018 18:07:24 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYz5zZzkX+fd1x9Admv1K0ZjESWfTILAJk7asiKsV+w8VYxMsUox6suiNv4ld8ob5EJk9A2 X-Received: by 2002:a63:8742:: with SMTP id i63-v6mr4200794pge.27.1537405644531; Wed, 19 Sep 2018 18:07:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537405644; cv=none; d=google.com; s=arc-20160816; b=v/Gl4JNvNK18+1p24Lg94/zvTlJYKbQGuCPcjl17NdSm8xX0hTsT1JlQSTPQOcyt6/ LPgHubJFJ3LNqFr3no6ps1fOOh/ERft0MVatuJZxMLWjbYHFdzvNiSeHV5jdZ5H7SPCW MCI8zumli0DelUuulaTTBsIFk8SG8haJ5xYpqeWhKdWbc3zWJR/xZ1aIsWTdKoABFxqQ rOAkqkWbLhljQxHKOTrnEMy/qboFqbxVp9+cfmJqtLeTOgfE7icxJlYPEXikxJlQtG/2 LoH/iz9ZFyUTulUiCsPZy4dT2OkqZbJqCINnINWStQ5ahdzYpAwowXKyzRNOt59JBL0p c1jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=4gENh/nkq+ueFJoDK0c//PUWWGpu695MthiwUIVw76Y=; b=OgESGAcAtSeT96MJo2wdllYTQYURtCSyvfu0deLpQcnXOa/xeNaP++yySZblRr5tID oo84cYWsZKLOAO3E5pJNSDNH/YNcN7DZxUPWon5Ds+AmQFJtofcGu2LfJHCEfZwJ5YdC lIMOvL1pSA7taymvjaS1Ztw2rNm7r5uMMMB4V0yU+inWHh7672DbZs9m3wobJ+fWmZCW 2q8UsdgUMqubuHFdl5gCyj2bh/W/PVQ0HdV5zXTLl7j7+9ZJP+Hgv1vu+hst8BkPhiMl Z9VV0KlG+Y1ly2rFgGanfHGUwWIj6JBKjqF+zrTW7ruH70yBVI8WcJApXYCdhXO0bvpX 0hGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q3d4jR9+; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p19-v6si22182240plo.432.2018.09.19.18.07.24; Wed, 19 Sep 2018 18:07:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q3d4jR9+; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726963AbeITGr7 (ORCPT + 13 others); Thu, 20 Sep 2018 02:47:59 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:43804 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726600AbeITGr6 (ORCPT ); Thu, 20 Sep 2018 02:47:58 -0400 Received: by mail-pg1-f196.google.com with SMTP id q19-v6so2700598pgn.10 for ; Wed, 19 Sep 2018 18:07:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=4gENh/nkq+ueFJoDK0c//PUWWGpu695MthiwUIVw76Y=; b=Q3d4jR9+e+pVKVuaj23vfbqsNT+6kLIzhjeapgPaIQbNAh30Ukjmx5XUgDDV6TWik2 3hHXTXWagfMDM8hmgL1OaKdKd4IvuMINC9JHCG5R/UB41rt1NBKdk9Skb+0No1PoqTr8 xflkIxrq1E/rKaGTUC66zu6DP+nEKyy8wK2No= 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=4gENh/nkq+ueFJoDK0c//PUWWGpu695MthiwUIVw76Y=; b=oXJDx7uJh5vyzJXki0Ls3Pf2Da2sc4WFvTtXTLgeM0REVFoEXENxnpRM+axmZW+NvA 7GbZFv2QoWm79mOq9+3r3uQGn0VWmau/zHaDpDhiOpcfl+ipYlB+itwSSumpRaZNkcn8 ZfWD7Otzc8mYK0O9ZHSltmpWSB61X0qVrUf1khBudxc+Sj6jJBqNrIfYl8Fn+JevVmmp ilJ/uwxcRD9M13LkaF51n5WsKmHqa+2cWP/SXTfHbQKsLUbmkC8RMJ0ELt0teiyaNYL8 4Vr7Kr5DnvR3C5uLmN+8Ccr09FZr2+wksYlxFMCNXaJvz+From07k9VsrB405LWnqF+T bIcw== X-Gm-Message-State: APzg51BHfnQHAlrkXwo3Na2COLI+5ScL/D4rxqfBH6zWSS1Y8Spo4fEh nNEl1CNOVmh6zLs4iOolSS+vaw== X-Received: by 2002:a63:1b07:: with SMTP id b7-v6mr34693465pgb.444.1537405642383; Wed, 19 Sep 2018 18:07:22 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id d132-v6sm33454688pgc.93.2018.09.19.18.07.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Sep 2018 18:07:21 -0700 (PDT) From: Bjorn Andersson To: "Luis R. Rodriguez" , Greg Kroah-Hartman Cc: "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, stable@vger.kernel.org, Rishabh Bhatnagar Subject: [PATCH] firmware: Always initialize the fw_priv list object Date: Wed, 19 Sep 2018 18:09:38 -0700 Message-Id: <20180920010938.10315-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org When freeing the fw_priv the item is taken off the list. This causes an oops in the FW_OPT_NOCACHE case as the list object is not initialized. Make sure to initialize the list object regardless of this flag. Fixes: 422b3db2a503 ("firmware: Fix security issue with request_firmware_into_buf()") Cc: stable@vger.kernel.org Cc: Rishabh Bhatnagar Signed-off-by: Bjorn Andersson --- drivers/base/firmware_loader/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.18.0 diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c index b3c0498ee433..8e9213b36e31 100644 --- a/drivers/base/firmware_loader/main.c +++ b/drivers/base/firmware_loader/main.c @@ -226,8 +226,11 @@ static int alloc_lookup_fw_priv(const char *fw_name, } tmp = __allocate_fw_priv(fw_name, fwc, dbuf, size); - if (tmp && !(opt_flags & FW_OPT_NOCACHE)) - list_add(&tmp->list, &fwc->head); + if (tmp) { + INIT_LIST_HEAD(&tmp->list); + if (!(opt_flags & FW_OPT_NOCACHE)) + list_add(&tmp->list, &fwc->head); + } spin_unlock(&fwc->lock); *fw_priv = tmp;