From patchwork Thu Oct 13 17:52:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2174 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp407524wrs; Thu, 13 Oct 2022 11:02:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4YqVFpDUZS/C/9afutw2RCQSiBJX0F4JikR1kClQUSPzcNX3IDqhOs+ffWZqvzFeUj2p87 X-Received: by 2002:a17:906:da85:b0:741:40a7:d08d with SMTP id xh5-20020a170906da8500b0074140a7d08dmr717997ejb.263.1665684128329; Thu, 13 Oct 2022 11:02:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665684128; cv=none; d=google.com; s=arc-20160816; b=Spe+nKJYapEF4FFkdBisO/psWPBXgAt26Jq9SFI9SexudVNfHPbj4vAhreXomKbQox ohWhEe7bfViID7VxYnxmF0Py/3YK+c6jAps3ypsX7tr/BZc1GxqPFJDa0QvzfneHVPWg IWoKxHE4YjrokvPWnismxnBvsMwYWBuD8GfezgNKmxD+K/YcWrnXjiOtCT8pP++l+Jk6 y7NaY5lakPDBdxiCKMsXdCSVT40az+4OPlkSvmXWUhEcF7PvA/Gluozok9MrjtqNjR1t +q3ew6aL+Z+3FMxadEfiLhOsZFmR1wCBeSpHL52mdh/e78oSo6H5MH1pqJLJaIKCvwee v8DA== 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=oMbqpDJ5TYUrpPUex0g3OjD52Jl1ieIyrTfnWVGUbLI=; b=uhcZeg/I43IOoZzDjY34hvEjn88MDnYRpZq7OEkgIXvSL6G83Ew+ecQBwzGz3X54S0 zsdOFqdGtQiFFFnh5t1I2Ovz62VOHBJdXMX+q2lwaWKNyV7sQmOC/KScWp+1iTDrQ3BQ Q8c9xk7mbxiLpP3B3mUrJ99Z5m5tFc7h6Rf1OHpUlH+hQnoJ/b8CVxLG2oBvcwrRXpOl S8sX/yG43NV665ysWPwLoMonMzmSIto7C6cTUF71aXWEKjko0c+RN4dpUjnJD5En9YHF Xvx+4ogUJaru6b+fWhoSFVia9bpUiplvPoydtXhM6TKPZjSbrcDC9OQpMG/huPi2rxNA pNUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BU67SVaV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dp14-20020a170906c14e00b0078d5d4a6b64si227639ejc.662.2022.10.13.11.01.33; Thu, 13 Oct 2022 11:02:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BU67SVaV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230289AbiJMSAk (ORCPT + 99 others); Thu, 13 Oct 2022 14:00:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230006AbiJMSAb (ORCPT ); Thu, 13 Oct 2022 14:00:31 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 586274D809; Thu, 13 Oct 2022 11:00:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 24928618F4; Thu, 13 Oct 2022 17:55:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 320A9C433D7; Thu, 13 Oct 2022 17:55:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683712; bh=FMtJbvUlcZMfZJsHs+zcMqbDLnAq+to6DJYsgnmO13c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BU67SVaVu4ntkQh5EoV00uRiKPtE9M5SiR8asNhOkbzacjbFdDE7AChYTAXGPVo7T EwTE+OzpPUCGI+TO0Y+W0tfap9+YPB3Cu+x29CAylZhLhsjtYBnA/YFtAfuTLbLSLX dtHcZ71O2gS9b3q52eaeE9s6+czh7C3oEJnCGeP8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lukas Straub , Richard Weinberger , Sasha Levin , Randy Dunlap Subject: [PATCH 5.10 24/54] um: Cleanup compiler warning in arch/x86/um/tls_32.c Date: Thu, 13 Oct 2022 19:52:18 +0200 Message-Id: <20221013175147.945279378@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175147.337501757@linuxfoundation.org> References: <20221013175147.337501757@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746596400895464676?= X-GMAIL-MSGID: =?utf-8?q?1746596400895464676?= From: Lukas Straub [ Upstream commit d27fff3499671dc23a08efd01cdb8b3764a391c4 ] arch.tls_array is statically allocated so checking for NULL doesn't make sense. This causes the compiler warning below. Remove the checks to silence these warnings. ../arch/x86/um/tls_32.c: In function 'get_free_idx': ../arch/x86/um/tls_32.c:68:13: warning: the comparison will always evaluate as 'true' for the address of 'tls_array' will never be NULL [-Waddress] 68 | if (!t->arch.tls_array) | ^ In file included from ../arch/x86/um/asm/processor.h:10, from ../include/linux/rcupdate.h:30, from ../include/linux/rculist.h:11, from ../include/linux/pid.h:5, from ../include/linux/sched.h:14, from ../arch/x86/um/tls_32.c:7: ../arch/x86/um/asm/processor_32.h:22:31: note: 'tls_array' declared here 22 | struct uml_tls_struct tls_array[GDT_ENTRY_TLS_ENTRIES]; | ^~~~~~~~~ ../arch/x86/um/tls_32.c: In function 'get_tls_entry': ../arch/x86/um/tls_32.c:243:13: warning: the comparison will always evaluate as 'true' for the address of 'tls_array' will never be NULL [-Waddress] 243 | if (!t->arch.tls_array) | ^ ../arch/x86/um/asm/processor_32.h:22:31: note: 'tls_array' declared here 22 | struct uml_tls_struct tls_array[GDT_ENTRY_TLS_ENTRIES]; | ^~~~~~~~~ Signed-off-by: Lukas Straub Acked-by: Randy Dunlap # build-tested Signed-off-by: Richard Weinberger Signed-off-by: Sasha Levin --- arch/x86/um/tls_32.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c index ac8eee093f9c..66162eafd8e8 100644 --- a/arch/x86/um/tls_32.c +++ b/arch/x86/um/tls_32.c @@ -65,9 +65,6 @@ static int get_free_idx(struct task_struct* task) struct thread_struct *t = &task->thread; int idx; - if (!t->arch.tls_array) - return GDT_ENTRY_TLS_MIN; - for (idx = 0; idx < GDT_ENTRY_TLS_ENTRIES; idx++) if (!t->arch.tls_array[idx].present) return idx + GDT_ENTRY_TLS_MIN; @@ -240,9 +237,6 @@ static int get_tls_entry(struct task_struct *task, struct user_desc *info, { struct thread_struct *t = &task->thread; - if (!t->arch.tls_array) - goto clear; - if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) return -EINVAL;