Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Assorted stuff #3392

Merged
merged 8 commits into from Jun 4, 2016
Merged

Assorted stuff #3392

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3c6f7c3
util-lib: make localed's nonempty() generic, rename it to empty_to_nu…
poettering May 30, 2016
788d2b0
sysv-generator: don't create Conflicts= deps towards shutdown.target …
poettering May 30, 2016
54f8c95
tree-wide: use ansi_highlight() instead of ANSI_HIGHLIGHT where appro…
poettering May 30, 2016
7565bb9
tree-wide: check colors_enabled() before outputting ANSI color strings
poettering May 30, 2016
ac96418
pager: don't start pager if the terminal is explicitly set to TERM=dumb
poettering May 30, 2016
76a9d0f
dhcp-server: fix integer underflow
poettering May 30, 2016
67044a2
bash: use the actual journal fields used in the journal files for com…
poettering May 30, 2016
ac83514
update TODO
poettering May 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/libsystemd-network/sd-dhcp-server.c
View file
Open in desktop
Expand Up @@ -633,7 +633,8 @@ static int parse_request(uint8_t code, uint8_t len, const void *option, void *us

break;
case SD_DHCP_OPTION_MAXIMUM_MESSAGE_SIZE:
if (len == 2)

if (len == 2 && unaligned_read_be16(option) >= sizeof(DHCPPacket))
req->max_optlen = unaligned_read_be16(option) - sizeof(DHCPPacket);

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we shouldn't reject the packet instead. But maybe that's too harsh. Simply ignoring the invalid option sounds OK too.

break;
Expand Down