From patchwork Fri May 1 13:23:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 226569 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, 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 519A3C4724C for ; Fri, 1 May 2020 13:50:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1FB322051A for ; Fri, 1 May 2020 13:50:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588341013; bh=JZaTmJJXTPqdDqVV9cglD1jNKO+CJtv6Qa925dntYME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SRhvYmwPTuyU+XILT9xaa8gqVNJlOvydZfiMxbuQmsdebWoZ4/XZPP835AiBr+SgQ fdCf/979XhBvs87YyVx+Jdxjo1Bl6oX/L+lRyt7YFn5Z9LChjggs1mxIr9dP1CkbvH k3sSOIOeJjOvd5V2Ksb5bhEmmRaFWcoBYsDvbLI8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730936AbgEANkR (ORCPT ); Fri, 1 May 2020 09:40:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:40286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730965AbgEANkP (ORCPT ); Fri, 1 May 2020 09:40:15 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 0ED9F205C9; Fri, 1 May 2020 13:40:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588340415; bh=JZaTmJJXTPqdDqVV9cglD1jNKO+CJtv6Qa925dntYME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xPnj2WqLXQ8ys9ElcYg94FabFgTHDf71S4e+wuIlHvu0MrvOO4qceAzqHZY/CFBPZ t6JVU5h7k87sl3mDAQj+LGHEMt7ASY8QN1b0kJFD+jU541PtdcefDmvoztjXW7dReu 0aVuyJVu2jvcjMBrxMEYX48D4dBN7jh3TejaAzgY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhiqiang Liu , Christian Brauner , Sasha Levin Subject: [PATCH 5.4 56/83] signal: check sig before setting info in kill_pid_usb_asyncio Date: Fri, 1 May 2020 15:23:35 +0200 Message-Id: <20200501131539.870805829@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200501131524.004332640@linuxfoundation.org> References: <20200501131524.004332640@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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 2b9295f2d2445..595a36ab87d02 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) {