Attachment 132202 Details for Bug 101354 – [36] bus/containers: Limit the size of metadata we will store

[patch] [36] bus/containers: Limit the size of metadata we will store

0044-bus-containers-Limit-the-size-of-metadata-we-will-st.patch (text/plain), 2.46 KB, created by Simon McVittie on 2017-06-23 16:40:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-06-23 16:40:23 UTC

Size: 2.46 KB

patch

obsolete

>From 61526b545639699c293a1bd1cde9286f68c4631e Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Thu, 22 Jun 2017 12:19:51 +0100
>Subject: [PATCH 44/49] bus/containers: Limit the size of metadata we will
> store
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> bus/containers.c | 30 ++++++++++++++++++++++++++++++
> 1 file changed, 30 insertions(+)
>
>diff --git a/bus/containers.c b/bus/containers.c
>index 0aeda633..9eb1ed3f 100644
>--- a/bus/containers.c
>+++ b/bus/containers.c
>@@ -568,6 +568,8 @@ bus_containers_handle_add_container_server (DBusConnection *connection,
>   DBusAddressEntry **entries = NULL;
>   int n_entries;
>   DBusMessage *reply = NULL;
>+  int metadata_size;
>+  int limit;
> 
>   context = bus_transaction_get_context (transaction);
>   containers = bus_context_get_containers (context);
>@@ -642,6 +644,34 @@ bus_containers_handle_add_container_server (DBusConnection *connection,
>   _dbus_assert (strcmp (_dbus_variant_get_signature (instance->metadata),
>                         "a{sv}") == 0);
> 
>+  /* For simplicity we don't count the size of the BusContainerInstance
>+   * itself, the object path, lengths, the non-payload parts of the DBusString,
>+   * NUL terminators and so on. That overhead is O(1) and relatively small.
>+   * This cannot overflow because all parts came from a message, and messages
>+   * are constrained to be orders of magnitude smaller than the maximum
>+   * int value. */
>+  metadata_size = _dbus_variant_get_length (instance->metadata) +
>+                  (int) strlen (type) +
>+                  (int) strlen (name);
>+  limit = bus_context_get_max_container_metadata_bytes (context);
>+
>+  if (metadata_size > limit)
>+    {
>+      DBusError local_error = DBUS_ERROR_INIT;
>+
>+      dbus_set_error (&local_error, DBUS_ERROR_LIMITS_EXCEEDED,
>+                      "Connection \"%s\" (%s) is not allowed to set "
>+                      "%d bytes of container metadata "
>+                      "(max_container_metadata_bytes=%d)",
>+                      bus_connection_get_name (connection),
>+                      bus_connection_get_loginfo (connection),
>+                      metadata_size, limit);
>+      bus_context_log_literal (context, DBUS_SYSTEM_LOG_WARNING,
>+                               local_error.message);
>+      dbus_move_error (&local_error, error);
>+      goto fail;
>+    }
>+
>   /* Argument 3: Named parameters */
>   if (!dbus_message_iter_next (&iter))
>     _dbus_assert_not_reached ("Message type was already checked");
>-- 
>2.11.0
>

Actions: View | Splinter Review

Attachments on bug 101354: 132165 | 132167 | 132169 | 132170 | 132171 | 132172 | 132173 | 132174 | 132175 | 132176 | 132177 | 132178 | 132179 | 132180 | 132181 | 132182 | 132183 | 132184 | 132185 | 132186 | 132187 | 132188 | 132189 | 132190 | 132191 | 132192 | 132193 | 132194 | 132195 | 132196 | 132197 | 132198 | 132199 | 132200 | 132201 | 132202 | 132203 | 132204 | 132205 | 132206 | 132207 | 132367 | 132368 | 132369 | 132370 | 132373 | 132508 | 132509 | 132510 | 132511 | 132512 | 132513 | 132514 | 132515 | 132516 | 132517 | 132518 | 132519 | 132520 | 132521 | 132522 | 132523 | 132524 | 132525 | 132526 | 132527 | 132528 | 132531 | 132532 | 132534 | 132535 | 132536 | 132537 | 132538 | 132539 | 132540 | 132541 | 132542 | 132543 | 132544 | 132545 | 132546 | 132547 | 132548 | 132549 | 132550 | 132551 | 132552 | 132553 | 132554 | 132555 | 132870 | 132871 | 132872 | 132873 | 132874 | 132875 | 132876 | 132877 | 132878 | 132879 | 132880 | 132881 | 132882 | 132885 | 132886 | 132887 | 132888 | 132891 | 132892 | 132893 | 132894 | 132895 | 132896 | 132897 | 132898 | 132899 | 132900 | 132901 | 132902 | 132903 | 132904 | 132905 | 132906 | 132907 | 132908 | 132909 | 132910 | 132911 | 132912 | 132913 | 132914 | 132915 | 132916 | 132917 | 132918 | 132919 | 132920 | 132921 | 132922 | 132923 | 132924 | 132925 | 132926 | 133003 | 133004 | 133005 | 133006 | 133007 | 133008 | 133009 | 133010 | 133011 | 133012 | 133013 | 133014 | 133015 | 133016 | 133017 | 133018 | 133019 | 133020 | 133021 | 133022 | 133023 | 133024 | 133025 | 133026 | 133027 | 133028 | 133029 | 133030 | 133031 | 133032 | 133033 | 133034 | 133035 | 133036 | 133037 | 133038 | 133039 | 133040 | 133041 | 133042 | 133043 | 133044 | 133045 | 133046 | 133047 | 133048 | 133049 | 133050 | 133051 | 133052 | 133053

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.