From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8994636EA9D for ; Wed, 28 Jan 2026 18:25:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769624756; cv=none; b=GIiwOOSpAYutALU3a+/MBxo3cQ1/yMmAJ69VaTo8Q8XqFpVr4AtsJ5ag0Vd6VQ0xz3yR8Ww/TrClpfkiop/DF8vgT8TFUNpjNjp4IubV6JG4yWplokARCKzNQtZuDgvL9XRiEUBlDfeMykXlsggWDrqiBWaTjN3tGlVdYRkFyFo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769624756; c=relaxed/simple; bh=koOSQYAdIwY+/FkaRCvDAYsDte1R+WRLE3csHer9qv0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V2BIfbZizXw9CCyXKKbwNo1GruW18e0G3qLXrnzmqbTZYklEitjvP2YhE/PQHJlOrxBz7tBZRw2X0sygKxVZ8HwjgxabGDOLfLFs1pK7NDpCu81mnFFPWyawHiR7GNWM0UCsj4bwPWCHhP2kWQlOSkgazZbDfKQ7hwRw8PIVZsA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eyPcweT8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eyPcweT8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26DD6C4CEF1; Wed, 28 Jan 2026 18:25:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769624755; bh=koOSQYAdIwY+/FkaRCvDAYsDte1R+WRLE3csHer9qv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eyPcweT8R/QV9aqSQnz3smbzV23y2ZQpZz9r6uyTy4uqyq8fuPZgVCeADmsFXB1b8 tH1Gp6Z+HaNB4SmBhU7LfLAQINAf7c9hJ/JwPyUfmLVkU2X2vyw46mlCkSbFOhxrES 6hReKoWZ0XIA9s+cxjGBHLWrwWvcH2jcovuPEFlLBx7lqDh5k3761RiRBuOWGJafWP 25UQlusvnT/4nH0vr1cmOJbbI4nFwhW28L53e2/YvrTDabItn3CUMxSuw53xX0Qh/m oen4VTHuAWfIqpVolwkO0vWmZ6hvEVAdzdJ/1oulShXDemTfjXFHIJIvNSPohaX8E3 1xArmJZogeeCw== From: Sasha Levin To: stable@vger.kernel.org Cc: Yang Guang , Zeal Robot , David Yang , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 5.10.y 1/2] w1: w1_therm: use swap() to make code cleaner Date: Wed, 28 Jan 2026 13:25:51 -0500 Message-ID: <20260128182552.2659610-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026012736-refined-nullify-a548@gregkh> References: <2026012736-refined-nullify-a548@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Yang Guang [ Upstream commit e233897b1f7a859092bd20b10bfd412013381a10 ] Use the macro 'swap()' defined in 'include/linux/minmax.h' to avoid opencoding it. Reported-by: Zeal Robot Signed-off-by: David Yang Signed-off-by: Yang Guang Link: https://lore.kernel.org/r/cb14f9e6e86cf8494ed2ddce6eec8ebd988908d9.1640077704.git.yang.guang5@zte.com.cn Signed-off-by: Greg Kroah-Hartman Stable-dep-of: 761fcf46a1bd ("w1: therm: Fix off-by-one buffer overflow in alarms_store") Signed-off-by: Sasha Levin --- drivers/w1/slaves/w1_therm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c index 3888643a22f60..ad8276cc82f5b 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -1783,7 +1783,7 @@ static ssize_t alarms_store(struct device *device, u8 new_config_register[3]; /* array of data to be written */ int temp, ret; char *token = NULL; - s8 tl, th, tt; /* 1 byte per value + temp ring order */ + s8 tl, th; /* 1 byte per value + temp ring order */ char *p_args, *orig; p_args = orig = kmalloc(size, GFP_KERNEL); @@ -1834,9 +1834,8 @@ static ssize_t alarms_store(struct device *device, th = int_to_short(temp); /* Reorder if required th and tl */ - if (tl > th) { - tt = tl; tl = th; th = tt; - } + if (tl > th) + swap(tl, th); /* * Read the scratchpad to change only the required bits -- 2.51.0