From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C87C4749E6 for ; Wed, 22 Jul 2026 16:54:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784739283; cv=none; b=A+9Mtrt448TPjRSdgnLFZBQKf8W+VW30WnCnBf/y0FMK5qhDrHIwlz1ssUcxNg9tPPQdBI2yy1/hunrKzUuHCFcHnWZ0AO68ysG2ebVmt9/QNwbtOR7rw0JbaHEt5yAcZrOxLteIQcTmwpCEv7AbNX9szDTQqVxJkL93aLULMFg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784739283; c=relaxed/simple; bh=Pz1BY718TtTge+dVetP+zKwkop5r3dn2MatZJrvEwCE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G5V7sQem8NqlDMJr156k8HuZQxNoaLtz7VOPxKgNrs3RwNbkcS+eUVniLZXE9VR/iC900ioYkjneo20Wm/bvs+U0blwIEm7Fxg16U9j5dAAXGGqW21tyQlqQgfCBo4DV3F4PA+Mdx6SmpQO/Xi3/Zb5kF/Dea6vYZbf5+fdw0fQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a4IhwfDJ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="a4IhwfDJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20B481F00A3A; Wed, 22 Jul 2026 16:54:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784739281; bh=f5w2ruHiep072u7xQhu5trocgUI+kjnoiVc/4x7Zwn8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=a4IhwfDJEoLhxyUQMwcLNjRtf9Et1GC4F59yJmBf8Rg7ZPVuL6vqwbDSpbYfYD15g cqWeoQMlJNf1PwqIH+1sKfAzKYOrFNiVdu4qxKqPesIqfatHXOar5UtUiwchFKvyeS EWPIeVffoqIyKBK0793XvlbjlvbXpIOt5RB3zXvsckQsgtk5LxU6MzGl5BXnKtTnyf gSTjlhgXMFlpzUM+ia4CCmyn93sqx+AURNzkd9IsTU58KVsr/C0cjN+ikbCyl11V6n 2ILozxZ9lZP6JUm6/iXx4MS/nc7ulEhHO5d0sgcItXbBtNmmKuK2skUcvNPQLmbhTN i0BD+OTHMnSiw== From: Sasha Levin To: stable@vger.kernel.org Cc: Jiacheng Yu , Thomas Zimmermann , Helge Deller , Sasha Levin Subject: [PATCH 6.1.y 2/2] fbcon: Use correct type for vc_resize() return value Date: Wed, 22 Jul 2026 12:54:38 -0400 Message-ID: <20260722165438.1853696-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260722165438.1853696-1-sashal@kernel.org> References: <2026072035-secular-countdown-b586@gregkh> <20260722165438.1853696-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jiacheng Yu [ Upstream commit 84202754fb1727dc3ee87f47104e4162ecc8ba3a ] The return value of vc_resize() is int, but fbcon_set_disp() stores it in an unsigned long variable. While the !ret check happens to work correctly by coincidence (negative values become large positive values), the types should match. Use int instead. Eliminates the following W=3 warning: drivers/video/fbdev/core/fbcon.c: In function 'fbcon_set_disp': drivers/video/fbdev/core/fbcon.c:1494:14: warning: implicit conversion from 'int' to 'unsigned long' [-Wconversion] Fixes: af0db3c1f898 ("fbdev: Fix vmalloc out-of-bounds write in fast_imageblit") Cc: stable@vger.kernel.org # v6.17+ Signed-off-by: Jiacheng Yu Reviewed-by: Thomas Zimmermann Signed-off-by: Helge Deller Signed-off-by: Sasha Levin --- drivers/video/fbdev/core/fbcon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 5b8c6966126f1e..2ceca6088664d7 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -1353,8 +1353,7 @@ static void fbcon_set_disp(struct fb_info *info, struct fb_var_screeninfo *var, struct vc_data **default_mode, *vc; struct vc_data *svc; struct fbcon_par *par = info->fbcon_par; - int rows, cols; - unsigned long ret = 0; + int rows, cols, ret; p = &fb_display[unit]; -- 2.53.0