From nobody Sat Sep 23 22:02:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RtNR40KxXz4vJvM; Sat, 23 Sep 2023 22:02:24 +0000 (UTC) (envelope-from gad@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RtNR37011z3XlL; Sat, 23 Sep 2023 22:02:23 +0000 (UTC) (envelope-from gad@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695506544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=/3l5zYlw8+jSnXxj9AA16ZnTGW8j72AVWEacqjOiorU=; b=xJMdvFd4T2k78fag+3uNvE0x+/VHFH5SWf8iLXr8w3VYMJbcCQt3oN4i/B9jsSLwv8Zjc4 FT+liM+xPn0oGTGgJaPWJAL4K6Egya0YWDmc8f5DMOXExgiEnBN+xTKBcCZOWPfCAFo3wO EvhUwc4o87laFvByl1QY+iT1B8wA1PvgfP6//Y61EQvz+vPgvCgud9DC8hvS9uLTgukM9T P3ZVsNk1pToodpEmTDrwiVA++C6lx2nvkO1fxk9jyiQvKP6AYfQdrSWnZbMBSgW8c8FLFk NOXwG3lu+L18EhD30hZA9Vj+Q7ke2V8oPwV3udGzviIaW905RDQi1YdB4pDknQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695506544; a=rsa-sha256; cv=none; b=JQN8dm2xDeDNqJKoS2do3Ij6UWWJi2nRjxpb9oHOXt8EIR7ZSLV/V02A8EX0qYDaF3ab8v ZyAkTGPQdHP48f+D8FHtSQQpSXtZrvFfG/TO/H/MvaS5IW1D3EltTVSj66cNg4fTh6ZpIO L0gTGej8eqC//zTrC6wZFCxBzVBJBbUnHIsc+IN9jUQ/u2kZblIP8m4UxySjnXRHKHohcl /d6QVdMNpoa0o1qKQcMiBQopCBp80hBpjFJdA6kbcE1+JENAQFl9a2QVwcQj9Fge+K2zwk E5IdMS7DY1WeAvC7PMF9lGTvHnng7/81Y2kewCPb1IkuDMcVC4PSwdYHEuP6PQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695506544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=/3l5zYlw8+jSnXxj9AA16ZnTGW8j72AVWEacqjOiorU=; b=NA+uiTmIluB1bS+hdlh2Okzw/zEREKSZq5XqjT8RGDc3x2oKz/WawTs+RG8FacyyOOz0lh kqDUBMvargj7CnPYQxRNrLjuwlLPdIxnscRLHssDt/5kuMSc7USbzlB2BtN4BC4nVaceSk jR79vU9YTUC6Qi9W9OUHr0TjU/mRU7BRd2cfjLQJegET3R/iKEE0unC/WLbaoQLo52bMOj JJ1XZkU8iiaVJqp+sHYmvjyEiae+spH3pWCZ7V2xYYkrlZEz33zJuvGqYXS7cvo9G+Ko4m RqnjFx8e/FIUymT7TbZuyKBrSHEPbXyK4diLg6pUI5H9z1BdZgRcKGD0Hutjlg== Received: from [128.113.125.56] (cpe-72-224-11-59.nycap.res.rr.com [72.224.11.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gad/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RtNR34gHhz1S3m; Sat, 23 Sep 2023 22:02:23 +0000 (UTC) (envelope-from gad@FreeBSD.org) From: Garance A Drosehn To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: ca927128bf6a - stable/13 - When parsing a rule to rotate log files ... MFC Date: Sat, 23 Sep 2023 18:02:16 -0400 X-Mailer: MailMate (1.14r5937) Message-ID: In-Reply-To: <202309232109.38NL94uB071348@gitrepo.freebsd.org> References: <202309232109.38NL94uB071348@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_037E44F4-1A1F-4BA6-832D-78B178A3D9EB_=" --=_MailMate_037E44F4-1A1F-4BA6-832D-78B178A3D9EB_= Content-Type: text/plain; format=flowed; markup=markdown Content-Transfer-Encoding: quoted-printable Apologies for the absurdly-long line in that MFC! The first time I tried the MFC I had modified the commit-log message to = follow standard conventions, but then it turned out I had the wrong = ssh-keys in effect so the 'git push' didn't work. I then redid all the steps for the MFC, this time setting up the correct = ssh-keys, but then I forgot the '--edit' on the git cherry-pick step. I = was expecting the editting to happen on the 'git push' step, and was = quite surprised to see the commit sail right in there! "Yay" for using = the right ssh-keys, but also an "oops...". > The branch stable/13 has been updated by gad: > > URL: = > https://cgit.FreeBSD.org/src/commit/?id=3Dca927128bf6a92abce27151fbb1ab= 112fd2a8385 > > commit ca927128bf6a92abce27151fbb1ab112fd2a8385 > Author: Garance A Drosehn > AuthorDate: 2021-12-30 20:45:13 +0000 > Commit: Garance A Drosehn > CommitDate: 2023-09-23 21:04:40 +0000 > > When parsing a rule to rotate log files on a specific week day, > parseDWM() can advance the time to the next week. If the next week = > is > in the next month, then tm_mon is incremented. However, the = > increment > was failing to handle the wraparound from December to January, so = > when > parsing a rule during the last week of the December, the month = > would > advance to month 12. This triggered an out-of-bounds read of the > mtab[] array in days_pmonth() after parseDWM() returned. To fix, > this change resets the month to January and increment the year = > when > the month increment wraps. -- = Garance Alistair Drosehn =3D drosih@rpi.edu Lead Developer @rpi and gad@FreeBSD.org Rensselaer Polytechnic Institute; Troy, NY; USA --=_MailMate_037E44F4-1A1F-4BA6-832D-78B178A3D9EB_= Content-Type: text/html Content-Transfer-Encoding: quoted-printable

Apologies for the absurdly-long line in that MFC!

The first time I tried the MFC I had modified the commit-= log message to follow standard conventions, but then it turned out I had = the wrong ssh-keys in effect so the 'git push' didn't work.

I then redid all the steps for the MFC, this time setting= up the correct ssh-keys, but then I forgot the '--edit' on the git cherr= y-pick step. I was expecting the editting to happen on the 'git push' st= ep, and was quite surprised to see the commit sail right in there! "= ;Yay" for using the right ssh-keys, but also an "oops...".=

The branch stable/13 has been updated by gad:

URL: https= ://cgit.FreeBSD.org/src/commit/?id=3Dca927128bf6a92abce27151fbb1ab112fd2a= 8385

commit ca927128bf6a92abce27151fbb1ab112fd2a8385
Author: Garance A Drosehn gad@FreeBSD.org
AuthorDate: 2021-12-30 20:45:13 +0000
Commit: Garance A Drosehn gad@FreeBSD.org
CommitDate: 2023-09-23 21:04:40 +0000

When parsing a rule to rotate log files =
on a specific week day,
parseDWM() can advance the time to the next week. If the next week is
in the next month, then tm_mon is incremented. However, the increment
was failing to handle the wraparound from December to January, so when
parsing a rule during the last week of the December, the month would
advance to month 12. This triggered an out-of-bounds read of the
mtab[] array in days_pmonth() after parseDWM() returned.  To fix,
this change resets the month to January and increment the year when
the month increment wraps.
-- =
Garance Alistair Drosehn = =3D drosih@rpi.edu
Lead Developer @rpi = and gad@FreeBSD.org
Rensselaer Polytechnic Institut= e; Troy, NY; USA
--=_MailMate_037E44F4-1A1F-4BA6-832D-78B178A3D9EB_=--