[systemd-devel] [PATCH] networkd: link - avoid null pointer deref

Tom Gundersen teg at jklm.no
Sat Jun 14 06:07:03 PDT 2014


On Fri, Jun 13, 2014 at 11:52 PM, Thomas H.P. Andersen <phomes at gmail.com> wrote:
> From: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
>
> ---
>  src/network/networkd-link.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
> index baa0756..39c8329 100644
> --- a/src/network/networkd-link.c
> +++ b/src/network/networkd-link.c
> @@ -2161,8 +2161,8 @@ int link_save(Link *link) {
>                          "DHCP_USE_DNS=%s\n"
>                          "DHCP_USE_NTP=%s\n",
>                          link->lease_file,
> -                        yes_no(link->network->dhcp_dns),
> -                        yes_no(link->network->dhcp_ntp));
> +                        yes_no(link->network && link->network->dhcp_dns),
> +                        yes_no(link->network && link->network->dhcp_ntp));

Hm, this should probably be an assert instead. It should not be
possible to have a DHCP lease, but no network. I have pushed such a
patch. Let me know if you are still seeing issues.

Cheers,

Tom

>          } else
>                  unlink(link->lease_file);
>
> --
> 1.9.3
>
> _______________________________________________
> systemd-devel mailing list
> systemd-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel


More information about the systemd-devel mailing list