Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp1163924pxu; Fri, 16 Oct 2020 05:38:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4Lcax5XVgNeKa52c4n2c/poczkgmRN18Aipt3PMEF7LSqm0Yg+UAVLXKZC0yz7oji+XcY X-Received: by 2002:aa7:c746:: with SMTP id c6mr3645739eds.221.1602851928843; Fri, 16 Oct 2020 05:38:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602851928; cv=none; d=google.com; s=arc-20160816; b=nQxsWwTAGSk57qEF4OQp8fSuTlaZQtPNR5vu3K25fTpIew+Y6bgxaZIMdZRRJTD3ti TwGyzhVbOQHGF1L/A3y/olHm7OWaf8IvWQ4Dod91p2L3sstVJgbxUsYFwQt7rCuxWoPn ZioSyQo8G9hS0rxy9Gpzc39qUOh6oQGZo1fpS5sEor4cY5C9sr90woVKAPj40GssMJ/l X7DP8VRSRFD2o4euBDKhf+m3s+CvEB9jMygP9iQUwgDArA1V47AiuUhFR9p/cbNswa+k i1+1GFkH4lCtDQRHJDZOsyEPolrqedb3fqeQFhQ8/GsU7dIBGvTXqEaTeYp6fWs7qqVU pBAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nm7/acYGa5kb55TXv7MrQ99U3XpoZ2k9kHggOkwBJyE=; b=i+Xysqr8eS4/el4/ZRsXnuPOoNkyQsZ2HxH723LgnzZfvA/bHvJegSQy4/TVhYnHHO Ko3oRIfFpBnMddRKKCKPky2KSe3TKHeiKRrG4NogvarhCKXl5kmqpfm/GaTtaYMDSsVG yeQDI+Uwq4Ts/E/Tozj5l9ynFjYZiphDtG+jOd6unN6Xc42pI9a3BxSXClexW3buoy8p UBxBcskkgNicgZSKoW/KOP1aNUAwXTze9RjugaayIoWltnbNT+2ltto6ODHyZI9GoE+S lgNDARLlhcxxgoqE17PrK6wa/+zzG8vI4o7WmBL0xuFkYtEiocWMe0ihc0/jof7Nem8u EjYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sBfcPyj1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q20si1856986ejb.151.2020.10.16.05.38.26; Fri, 16 Oct 2020 05:38:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sBfcPyj1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405930AbgJPJMJ (ORCPT + 99 others); Fri, 16 Oct 2020 05:12:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:41372 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405880AbgJPJLl (ORCPT ); Fri, 16 Oct 2020 05:11:41 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B08E220872; Fri, 16 Oct 2020 09:11:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602839501; bh=OkU+ijpoJzBxsdp/VudQKEGfE7VMXl6Vmb731poS+Is=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sBfcPyj1kExoRg33a/q7oQFWdb4GE05LWaL4nGD8fUtNPNhjGTU0ue0JbhFgcYDRS uU7ahG8Y2cNpim4jsWzBUgimCaEtif9Azmr58CnUch+skrCL0DL+3djz4mLfesN+ck TZNCRYUQG3YEvePgBPlWX7x+l9Y5tG1boYmt4qfs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Deucher Subject: [PATCH 5.9 13/15] Revert "drm/amdgpu: Fix NULL dereference in dpm sysfs handlers" Date: Fri, 16 Oct 2020 11:08:15 +0200 Message-Id: <20201016090437.824053443@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201016090437.170032996@linuxfoundation.org> References: <20201016090437.170032996@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alex Deucher commit 2456c290a7889be492cb96092b62d16c11176f72 upstream. This regressed some working configurations so revert it. Will fix this properly for 5.9 and backport then. This reverts commit 38e0c89a19fd13f28d2b4721035160a3e66e270b. Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c @@ -796,7 +796,8 @@ static ssize_t amdgpu_set_pp_od_clk_volt tmp_str++; while (isspace(*++tmp_str)); - while ((sub_str = strsep(&tmp_str, delimiter)) != NULL) { + while (tmp_str[0]) { + sub_str = strsep(&tmp_str, delimiter); ret = kstrtol(sub_str, 0, ¶meter[parameter_size]); if (ret) return -EINVAL; @@ -1066,7 +1067,8 @@ static ssize_t amdgpu_read_mask(const ch memcpy(buf_cpy, buf, bytes); buf_cpy[bytes] = '\0'; tmp = buf_cpy; - while ((sub_str = strsep(&tmp, delimiter)) != NULL) { + while (tmp[0]) { + sub_str = strsep(&tmp, delimiter); if (strlen(sub_str)) { ret = kstrtol(sub_str, 0, &level); if (ret) @@ -1695,7 +1697,8 @@ static ssize_t amdgpu_set_pp_power_profi i++; memcpy(buf_cpy, buf, count-i); tmp_str = buf_cpy; - while ((sub_str = strsep(&tmp_str, delimiter)) != NULL) { + while (tmp_str[0]) { + sub_str = strsep(&tmp_str, delimiter); ret = kstrtol(sub_str, 0, ¶meter[parameter_size]); if (ret) return -EINVAL;