Page MenuHomeFreeBSD
Differential D7068

FFL: Change tcp_hhook_data len from long to uint32_t
ClosedPublic
Actions

Authored by jtl on Jul 2 2016, 8:27 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 14, 5:41 AM
Unknown Object (File)
Feb 20 2025, 5:48 AM
Unknown Object (File)
Feb 10 2025, 9:27 PM
Unknown Object (File)
Feb 10 2025, 9:42 AM
Unknown Object (File)
Jan 30 2025, 12:59 PM
Unknown Object (File)
Jan 12 2025, 1:19 PM
Unknown Object (File)
Dec 25 2024, 2:19 PM
Unknown Object (File)
Dec 13 2024, 11:45 PM
View All 41 Files
Subscribers
imp

Details

Reviewers
gnn
Group Reviewers
transport
Summary

Change tcp_hhook_data len from long to uint32_t. Due to change from signed to unsigned, add logic to avoid underflow.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 4410
Build 4460: arc lint + arc unit

Event Timeline

jtl updated this revision to Diff 18090.Jul 2 2016, 8:27 PM
jtl retitled this revision from to FFL: Change tcp_hhook_data len from long to uint32_t.
jtl updated this object.
jtl edited the test plan for this revision. (Show Details)
jtl added a reviewer: transport.
Herald edited edge metadata. · View Herald TranscriptJul 2 2016, 8:27 PM
Herald added a subscriber: imp. · View Herald Transcript
gnn accepted this revision.Jul 4 2016, 12:26 AM
gnn added a reviewer: gnn.
This revision is now accepted and ready to land.Jul 4 2016, 12:26 AM
jtl closed this revision.Oct 6 2016, 7:11 PM

Committed in rS306769.

Revision Contents
Changeset List

PathSize
sys/
netinet/
khelp/
9 lines
4 lines
2 lines

Diff 18090

View Options

sys/netinet/khelp/h_ertt.c

Show First 20 Lines • Show All 2,339 Lines • ▼ Show 20 Lines
} }
int int
pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r, pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r,
rman_res_t start, rman_res_t end) rman_res_t start, rman_res_t end)
{ {
struct pcib_softc *sc; struct pcib_softc *sc;
struct pcib_window *w; struct pcib_window *w;
rman_res_t wmask;
int error; int error;
sc = device_get_softc(bus); sc = device_get_softc(bus);
/* /*
* If the resource wasn't sub-allocated from one of our region * If the resource wasn't sub-allocated from one of our region
* managers then just pass the request up. * managers then just pass the request up.
*/ */
Show All 14 Lines KASSERT(w != NULL,
("%s: no window for resource (%#jx-%#jx) type %d", ("%s: no window for resource (%#jx-%#jx) type %d",
__func__, rman_get_start(r), rman_get_end(r), type)); __func__, rman_get_start(r), rman_get_end(r), type));
/* /*
* If our window isn't big enough to grow the sub-allocation * If our window isn't big enough to grow the sub-allocation
* then we need to expand the window. * then we need to expand the window.
*/ */
if (start < w->base || end > w->limit) { if (start < w->base || end > w->limit) {
error = pcib_expand_window(sc, w, type, start, end); wmask = ((rman_res_t)1 << w->step) - 1;
error = pcib_expand_window(sc, w, type,
MIN(start & ~wmask, w->base),
MAX(end | wmask, w->limit));
if (error != 0) if (error != 0)
return (error); return (error);
if (bootverbose)
device_printf(sc->dev,
"grew %s window to %#jx-%#jx\n",
w->name, (uintmax_t)w->base,
(uintmax_t)w->limit);
pcib_write_windows(sc, w->mask);
} }
} }
return (rman_adjust_resource(r, start, end)); return (rman_adjust_resource(r, start, end));
} }
int int
pcib_release_resource(device_t dev, device_t child, int type, int rid, pcib_release_resource(device_t dev, device_t child, int type, int rid,
▲ Show 20 Lines • Show All 605 Lines • Show Last 20 Lines
View Options

sys/netinet/tcp_output.c

Show First 20 Lines • Show All 2,339 Lines • ▼ Show 20 Lines
} }
int int
pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r, pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r,
rman_res_t start, rman_res_t end) rman_res_t start, rman_res_t end)
{ {
struct pcib_softc *sc; struct pcib_softc *sc;
struct pcib_window *w; struct pcib_window *w;
rman_res_t wmask;
int error; int error;
sc = device_get_softc(bus); sc = device_get_softc(bus);
/* /*
* If the resource wasn't sub-allocated from one of our region * If the resource wasn't sub-allocated from one of our region
* managers then just pass the request up. * managers then just pass the request up.
*/ */
Show All 14 Lines KASSERT(w != NULL,
("%s: no window for resource (%#jx-%#jx) type %d", ("%s: no window for resource (%#jx-%#jx) type %d",
__func__, rman_get_start(r), rman_get_end(r), type)); __func__, rman_get_start(r), rman_get_end(r), type));
/* /*
* If our window isn't big enough to grow the sub-allocation * If our window isn't big enough to grow the sub-allocation
* then we need to expand the window. * then we need to expand the window.
*/ */
if (start < w->base || end > w->limit) { if (start < w->base || end > w->limit) {
error = pcib_expand_window(sc, w, type, start, end); wmask = ((rman_res_t)1 << w->step) - 1;
error = pcib_expand_window(sc, w, type,
MIN(start & ~wmask, w->base),
MAX(end | wmask, w->limit));
if (error != 0) if (error != 0)
return (error); return (error);
if (bootverbose)
device_printf(sc->dev,
"grew %s window to %#jx-%#jx\n",
w->name, (uintmax_t)w->base,
(uintmax_t)w->limit);
pcib_write_windows(sc, w->mask);
} }
} }
return (rman_adjust_resource(r, start, end)); return (rman_adjust_resource(r, start, end));
} }
int int
pcib_release_resource(device_t dev, device_t child, int type, int rid, pcib_release_resource(device_t dev, device_t child, int type, int rid,
▲ Show 20 Lines • Show All 605 Lines • Show Last 20 Lines
View Options

sys/netinet/tcp_var.h

Show First 20 Lines • Show All 2,339 Lines • ▼ Show 20 Lines
} }
int int
pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r, pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r,
rman_res_t start, rman_res_t end) rman_res_t start, rman_res_t end)
{ {
struct pcib_softc *sc; struct pcib_softc *sc;
struct pcib_window *w; struct pcib_window *w;
rman_res_t wmask;
int error; int error;
sc = device_get_softc(bus); sc = device_get_softc(bus);
/* /*
* If the resource wasn't sub-allocated from one of our region * If the resource wasn't sub-allocated from one of our region
* managers then just pass the request up. * managers then just pass the request up.
*/ */
Show All 14 Lines KASSERT(w != NULL,
("%s: no window for resource (%#jx-%#jx) type %d", ("%s: no window for resource (%#jx-%#jx) type %d",
__func__, rman_get_start(r), rman_get_end(r), type)); __func__, rman_get_start(r), rman_get_end(r), type));
/* /*
* If our window isn't big enough to grow the sub-allocation * If our window isn't big enough to grow the sub-allocation
* then we need to expand the window. * then we need to expand the window.
*/ */
if (start < w->base || end > w->limit) { if (start < w->base || end > w->limit) {
error = pcib_expand_window(sc, w, type, start, end); wmask = ((rman_res_t)1 << w->step) - 1;
error = pcib_expand_window(sc, w, type,
MIN(start & ~wmask, w->base),
MAX(end | wmask, w->limit));
if (error != 0) if (error != 0)
return (error); return (error);
if (bootverbose)
device_printf(sc->dev,
"grew %s window to %#jx-%#jx\n",
w->name, (uintmax_t)w->base,
(uintmax_t)w->limit);
pcib_write_windows(sc, w->mask);
} }
} }
return (rman_adjust_resource(r, start, end)); return (rman_adjust_resource(r, start, end));
} }
int int
pcib_release_resource(device_t dev, device_t child, int type, int rid, pcib_release_resource(device_t dev, device_t child, int type, int rid,
▲ Show 20 Lines • Show All 605 Lines • Show Last 20 Lines