D5426.diff
No OneTemporary
Actions

Size

702 B

Referenced Files

None

Subscribers

None

D5426.diff
View Options

	Index: head/sys/netpfil/pf/pf_ioctl.c
	===================================================================
	--- head/sys/netpfil/pf/pf_ioctl.c
	+++ head/sys/netpfil/pf/pf_ioctl.c
	@@ -2718,13 +2718,14 @@
	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) {