diff options
| author | Renato Botelho <renato@netgate.com> | 2016-03-03 08:07:19 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-03-03 08:07:19 -0300 |
| commit | 1f35e43df1094ff19ecabbd0066238226407f832 (patch) | |
| tree | fa20e9fb11a80fd103d4b0f4b045c05dbb6a9ff7 | |
| parent | 728813a02a03cdab41bffc21d729fb394aef805c (diff) | |
| parent | 2667c3d5fbaef4a37daa33b9e899e7bd2070cf31 (diff) | |
| download | FreeBSD-src-1f35e43df1094ff19ecabbd0066238226407f832.zip FreeBSD-src-1f35e43df1094ff19ecabbd0066238226407f832.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
| -rw-r--r-- | sys/netpfil/pf/pf_ioctl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 420214a..b00952c 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -2786,13 +2786,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) { |
