Date: Wed, 24 Feb 2016 23:47:55 -0800 From: Conrad Meyer <cem@FreeBSD.org> To: Adrian Chadd <adrian.chadd@gmail.com> Cc: Kristof Provost <kp@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r296025 - head/sys/netpfil/pf Message-ID: <CAG6CVpWwidL6S90fnThc7mXp9sj3PbJB6rvkBN=MmbvFS%2B_vtw@mail.gmail.com> In-Reply-To: <CAJ-Vmok_-SzGnUdYi%2BnnDYdGhcKXOUthC1nnPyxHrnWJCKA%2Bcw@mail.gmail.com> References: <201602250733.u1P7Xxoh041746@repo.freebsd.org> <CAJ-Vmok_-SzGnUdYi%2BnnDYdGhcKXOUthC1nnPyxHrnWJCKA%2Bcw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Feb 24, 2016 at 11:41 PM, Adrian Chadd <adrian.chadd@gmail.com> wrote:
> .. what's capping totlen so one doesn't run out of memory?
There was a DoS vector before (user controlled io->pfrio_size) and
basically the same DoS vector now (either of io->pfrio_size or
io->pfrio_size2). This change isn't a regression. Still, it should
be fixed.
Best,
Conrad
> On 24 February 2016 at 23:33, Kristof Provost <kp@freebsd.org> wrote:
>> ...
>> Modified: head/sys/netpfil/pf/pf_ioctl.c
>> ==============================================================================
>> --- head/sys/netpfil/pf/pf_ioctl.c Thu Feb 25 07:03:10 2016 (r296024)
>> +++ head/sys/netpfil/pf/pf_ioctl.c Thu Feb 25 07:33:59 2016 (r296025)
>> @@ -2718,13 +2718,14 @@ DIOCCHANGEADDR_error:
>> case DIOCRSETADDRS: {
>> struct pfioc_table *io = (struct pfioc_table *)addr;
>> struct pfr_addr *pfras;
>> - size_t totlen;
>> + size_t totlen, count;
>>
>> if (io->pfrio_esize != sizeof(struct pfr_addr)) {
>> error = ENODEV;
>> break;
>> }
>> - totlen = io->pfrio_size * sizeof(struct pfr_addr);
>> + count = max(io->pfrio_size, io->pfrio_size2);
>> + totlen = count * sizeof(struct pfr_addr);
>> pfras = malloc(totlen, M_TEMP, M_WAITOK);
>> error = copyin(io->pfrio_buffer, pfras, totlen);
>> if (error) {
>>
>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAG6CVpWwidL6S90fnThc7mXp9sj3PbJB6rvkBN=MmbvFS%2B_vtw>