From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 E5B17C55191 for ; Fri, 24 Apr 2020 12:33:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BDF5720776 for ; Fri, 24 Apr 2020 12:33:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587731586; bh=r+58TxfbjRQyFo/V85lt/JewdVBQUjmHSiSk+/05HgQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jahtFh2H06B2UcEH/dLTsahqaM2q/+5m/JfPQRBUhBNyYzLjIctz1iFc5h4xbOgGT V4kaIDDj/hkE9hxJ/iK4nvRfeyO9AzNruyRoB8jTjn5ArbuCIob0AkodMw0XcAfTNg auRlRdI56PFhmx/2DXCGvZXIORv/06PCNWnU+2rQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727053AbgDXMdG (ORCPT ); Fri, 24 Apr 2020 08:33:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:51860 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726667AbgDXMWm (ORCPT ); Fri, 24 Apr 2020 08:22:42 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BADDA21473; Fri, 24 Apr 2020 12:22:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587730962; bh=r+58TxfbjRQyFo/V85lt/JewdVBQUjmHSiSk+/05HgQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BhKe/5yr6A7/7f2lLwqAGaiFSysKwQqm4h2woVPSYE+Ktnj3z0+zPPteMzCPm++yS ht2oQf4zHEv3+Cs/rXLLdJ4U+ocNUKocROFgsCM64dRcbS3MmslfOzQKmQEp2bEd7N lH6Ap94w73zZj7E2A9zGBzj9GYHRoZG+Fxp5h3QQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhiqiang Liu , Christian Brauner , Sasha Levin Subject: [PATCH AUTOSEL 5.6 04/38] signal: check sig before setting info in kill_pid_usb_asyncio Date: Fri, 24 Apr 2020 08:22:02 -0400 Message-Id: <20200424122237.9831-4-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200424122237.9831-1-sashal@kernel.org> References: <20200424122237.9831-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhiqiang Liu [ Upstream commit eaec2b0bd30690575c581eebffae64bfb7f684ac ] In kill_pid_usb_asyncio, if signal is not valid, we do not need to set info struct. Signed-off-by: Zhiqiang Liu Acked-by: Christian Brauner Link: https://lore.kernel.org/r/f525fd08-1cf7-fb09-d20c-4359145eb940@huawei.com Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- kernel/signal.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/signal.c b/kernel/signal.c index e58a6c619824f..3f94894d1253d 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1510,15 +1510,15 @@ int kill_pid_usb_asyncio(int sig, int errno, sigval_t addr, unsigned long flags; int ret = -EINVAL; + if (!valid_signal(sig)) + return ret; + clear_siginfo(&info); info.si_signo = sig; info.si_errno = errno; info.si_code = SI_ASYNCIO; *((sigval_t *)&info.si_pid) = addr; - if (!valid_signal(sig)) - return ret; - rcu_read_lock(); p = pid_task(pid, PIDTYPE_PID); if (!p) { -- 2.20.1