Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp845502pja; Wed, 1 Apr 2020 09:44:28 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuyipeZdr4MBmGEW3AzUo1IuvMsb73p7N1jbCdCvcdlha8Rul5D6TpE3ENtbMHh7Sb0m4K6 X-Received: by 2002:a9d:f05:: with SMTP id 5mr17048169ott.263.1585759467814; Wed, 01 Apr 2020 09:44:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759467; cv=none; d=google.com; s=arc-20160816; b=crEZHXYBFdppb8QImI9l3emPkxAFDfk1DnviUfmT3hTwCBAO5aIxGP0m5DoXZIOVxU vBiFzgEOvmCqSUgHAxLRiGNFscd43wYt1qDMT5CRzH0ZqGVFrHTNni3K6DDVgav60JNk lNHAUSVjYY4jZhJtLHiEq6ClZMgR3u526uDgvU7/mao5Z3/Sci9sklXbpMVQFgbX7EwH 9RzGf7DIf4hW7vl7jwHdJNqc+T5DJc9DOSxPsOfZSJTwT67bKo5chmnwqp/9g+wIgxwF PPsRYBGmdDXODUz7vSCmIbeCFt3lohUoSE7DFiznRERSnu231o9wUzSWwvLJq4BcR+0H gzkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=er+axuHORNqkEJr0OwxyaMCnK6FslAJ1N+7cadsYy44=; b=kLTZJ6Zbv5HWbyBMND8BT8Zx+QkvrYVmFGuuxca59DVxOhFI8LtmKV8g+DMzZ7oP/9 8/bNNlCpcAhrQZFeSwyiexkhy1F/uFiwTq4HLTB3kANR2BahuxEImO/E9f8dUVMrLVwt 9FgAU1Y/H4a1XxKpjhnQ60PSRvWYxCPp64hGLUx5rM1VXgJYuQN+808bJyKq6wAAYWW5 s00oqymMf/GaCnQasQHmG2l4c+MxZqT+Gcbp7uApQCEH9Q0FZo98w4YqT8ufg820/iXd EJP7zJPJOCScuvBgQoPQkjxQZtnuKlOA4SvHD3+vIQbcVaJ727maYOPVdnVWyt2Ktag7 7RhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MR2XXLGa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g8si1256050otn.56.2020.04.01.09.44.15; Wed, 01 Apr 2020 09:44:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@kernel.org header.s=default header.b=MR2XXLGa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389597AbgDAQnN (ORCPT + 99 others); Wed, 1 Apr 2020 12:43:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:43970 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389600AbgDAQnL (ORCPT ); Wed, 1 Apr 2020 12:43:11 -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 D91B4206F8; Wed, 1 Apr 2020 16:43:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759391; bh=IAoZwNTw/LJYfeiRAw+x03kYdpq+o+xNOD7CYcRqTAQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MR2XXLGaU6VEJTat9c0TMOLh/B9TJHR7UFEcpJY48MII14Rm6L7WvQVbfHsxFru6C 88juEQYjAKMguSeQr5XoyY1XeDHotBPGfqeLAULBwamERFGBGfEV330zHsNW8jZdyK H74kSudo84WHnwHTZfC/32ZqMQfgLKECsck+GvwQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , "David S. Miller" Subject: [PATCH 4.14 065/148] NFC: fdp: Fix a signedness bug in fdp_nci_send_patch() Date: Wed, 1 Apr 2020 18:17:37 +0200 Message-Id: <20200401161559.935273045@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter [ Upstream commit 0dcdf9f64028ec3b75db6b691560f8286f3898bf ] The nci_conn_max_data_pkt_payload_size() function sometimes returns -EPROTO so "max_size" needs to be signed for the error handling to work. We can make "payload_size" an int as well. Fixes: a06347c04c13 ("NFC: Add Intel Fields Peak NFC solution driver") Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/nfc/fdp/fdp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/drivers/nfc/fdp/fdp.c +++ b/drivers/nfc/fdp/fdp.c @@ -192,7 +192,7 @@ static int fdp_nci_send_patch(struct nci const struct firmware *fw; struct sk_buff *skb; unsigned long len; - u8 max_size, payload_size; + int max_size, payload_size; int rc = 0; if ((type == NCI_PATCH_TYPE_OTP && !info->otp_patch) || @@ -215,8 +215,7 @@ static int fdp_nci_send_patch(struct nci while (len) { - payload_size = min_t(unsigned long, (unsigned long) max_size, - len); + payload_size = min_t(unsigned long, max_size, len); skb = nci_skb_alloc(ndev, (NCI_CTRL_HDR_SIZE + payload_size), GFP_KERNEL);