From patchwork Thu Sep 25 19:28:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Milan Zamazal X-Patchwork-Id: 24455 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 430A9C328C for ; Thu, 25 Sep 2025 19:29:15 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C72176B5FB; Thu, 25 Sep 2025 21:29:14 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="acZ6Rs8a"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E61AF69318 for ; Thu, 25 Sep 2025 21:29:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758828549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NwrFJpnHPVrzbjm6OuH8AKj+KCwc3Xtq1lsigQHKLgQ=; b=acZ6Rs8af4fKn10QR4Em5sEmG5gsFHN2Z3PHysIw6qhhaZ+3T7gVDFKbTVKpXaIxVcWOA9 DRjgZnia82QQDG1/9UX4Fcc1a/La/anP6EMeVIsxceL5DrRi9tBNGCWqHji8FgqIt7m++y x731pOj4MYTle1bkgXdghDY2+j2R6yg= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-591-Qij5hSRKMP2DEeijs3TKLA-1; Thu, 25 Sep 2025 15:29:06 -0400 X-MC-Unique: Qij5hSRKMP2DEeijs3TKLA-1 X-Mimecast-MFC-AGG-ID: Qij5hSRKMP2DEeijs3TKLA_1758828545 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2D4FE195609E; Thu, 25 Sep 2025 19:29:05 +0000 (UTC) Received: from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.32.62]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 878E91956095; Thu, 25 Sep 2025 19:29:03 +0000 (UTC) From: Milan Zamazal To: libcamera-devel@lists.libcamera.org Cc: Milan Zamazal , pobrn@protonmail.com, mail@maciej.szmigiero.name Subject: [PATCH v4 1/7] libcamera: software_isp: Fix width adjustment in SwStatsCpu::setWindow Date: Thu, 25 Sep 2025 21:28:50 +0200 Message-ID: <20250925192856.77881-2-mzamazal@redhat.com> In-Reply-To: <20250925192856.77881-1-mzamazal@redhat.com> References: <20250925192856.77881-1-mzamazal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Z4H8srSy5dJLyFkciTpfr8xkFKB7TxW0RA8RA5XRvPM_1758828545 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" SwStatsCpu::setWindow reduces the window width by the added x-offset, to prevent exceeding image bounds. But if the window width is smaller than the x-offset, we get unsigned integer underflow. Fix it by setting the window width to 0 in such a case. Signed-off-by: Milan Zamazal Reviewed-by: Barnabás Pőcze --- src/libcamera/software_isp/swstats_cpu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcamera/software_isp/swstats_cpu.cpp b/src/libcamera/software_isp/swstats_cpu.cpp index 4b77b3600..e8a1d52f2 100644 --- a/src/libcamera/software_isp/swstats_cpu.cpp +++ b/src/libcamera/software_isp/swstats_cpu.cpp @@ -426,7 +426,7 @@ void SwStatsCpu::setWindow(const Rectangle &window) window_.y &= ~(patternSize_.height - 1); /* width_ - xShift_ to make sure the window fits */ - window_.width -= xShift_; + window_.width = (window_.width > xShift_ ? window_.width - xShift_ : 0); window_.width &= ~(patternSize_.width - 1); window_.height &= ~(patternSize_.height - 1); }