dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-04 23:20:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27858 from mrc0mmand/followups

Browse Source 
Use structured initialization in two more places
This commit is contained in:
Luca Boccassi
2023-05-31 11:09:53 +01:00
committed by GitHub
parent 1a7e5c51dc f018fad483
commit 840d3b1522
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/journal-remote/journal-remote-write.c
View File

@@ -28,19 +28,20 @@ int writer_new(RemoteServer *server, Writer **ret) {
assert(server);
assert(ret);
w = new0(Writer, 1);
w = new(Writer, 1);
if (!w)
return -ENOMEM;
w->n_ref = 1;
w->metrics = server->metrics;
*w = (Writer) {
.n_ref = 1,
.metrics = server->metrics,
.server = server,
};
w->mmap = mmap_cache_new();
if (!w->mmap)
return -ENOMEM;
w->server = server;
if (is_dir(server->output, /* follow = */ true) > 0) {
w->output = strdup(server->output);
if (!w->output)

30
src/libsystemd-network/fuzz-dhcp-server.c
View File

@@ -19,30 +19,32 @@ ssize_t sendmsg(int sockfd, const struct msghdr *msg, int flags) {
static int add_lease(sd_dhcp_server *server, const struct in_addr *server_address, uint8_t i) {
_cleanup_(dhcp_lease_freep) DHCPLease *lease = NULL;
static const uint8_t chaddr[] = {3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3};
int r;
assert(server);
lease = new0(DHCPLease, 1);
lease = new(DHCPLease, 1);
if (!lease)
return -ENOMEM;
lease->client_id.data = malloc(2);
*lease = (DHCPLease) {
.address = htobe32(UINT32_C(10) << 24 | i),
.chaddr = { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 },
.expiration = UINT64_MAX,
.gateway = server_address->s_addr,
.hlen = ETH_ALEN,
.htype = ARPHRD_ETHER,
.client_id.length = 2,
};
lease->client_id.data = new(uint8_t, lease->client_id.length);
if (!lease->client_id.data)
return -ENOMEM;
lease->client_id.length = 2;
lease->client_id.data[0] = 2;
lease->client_id.data[1] = i;
lease->address = htobe32(UINT32_C(10) << 24 | i);
lease->gateway = server_address->s_addr;
lease->expiration = UINT64_MAX;
lease->htype = ARPHRD_ETHER;
lease->hlen = ETH_ALEN;
memcpy(lease->chaddr, chaddr, ETH_ALEN);
lease->server = server; /* This must be set just before hashmap_put(). */
r = hashmap_ensure_put(&server->bound_leases_by_client_id, &dhcp_lease_hash_ops, &lease->client_id, lease);
@@ -54,22 +56,18 @@ static int add_lease(sd_dhcp_server *server, const struct in_addr *server_addres
return r;
TAKE_PTR(lease);
return 0;
}
static int add_static_lease(sd_dhcp_server *server, uint8_t i) {
uint8_t id[2] = { 2, i };
int r;
assert(server);
r = sd_dhcp_server_set_static_lease(
return sd_dhcp_server_set_static_lease(
server,
&(struct in_addr) { .s_addr = htobe32(UINT32_C(10) << 24 | i)},
id, ELEMENTSOF(id));
return r;
}
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {