From nobody Thu Dec 26 22:24:50 2024 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C91C6188599 for ; Thu, 31 Oct 2024 09:25:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730366721; cv=none; b=jMOMazYRbtEMCkEAvXq2iurcZV+8Kl6MJ3R62lW/1qfiQBa+uZBeY8gM1+HetIuN4IQrgTsTw5hBBi926uV2fgmWd68OmsTNS2hvTRYsllrMvsdDKkGbh3VRXlhR8XteOfNpIbQkcgnmqpMmD5dFpxu4NIyaIUJV91HnZVCj+TY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730366721; c=relaxed/simple; bh=BaCLeQ7iXY0XNA7pP/Weqk1V3JxT8DHgJJgDs0/bwLc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=txvwHEXOkLyDvecfPatce4074iRFgZG8xKZLKmoae48b6CALZ5HDou0NVwMEr5fZoo8krx3xpdAHvpfM0/nZdeAt8pIFGJNoQFJZxiismkFjpciIUGp3AXa5EwUTq40GwPzZtHmWwnvJ4N6s3cGenXPDMhCM11MWkOlntYNZ1Uk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=LimNjLHr; arc=none smtp.client-ip=209.85.216.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="LimNjLHr" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2e2e23f2931so532516a91.0 for ; Thu, 31 Oct 2024 02:25:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730366717; x=1730971517; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CqSY6XKc+cFZ1v5HfdPsfl67/vM0PLwzt3YKJ3PRw7g=; b=LimNjLHrUPcR1Doo+d1HjeQbyQVGVV+QNaxF1TshyY8Wo00hwxhQ/02FBrUCywfF3v hJTlNEMwkAVOIJpQt7zHU4AiAvyUiSZVYRjhSC3p6KpqEWtjqKoZcBQhXYTutthliJ+o +Bko2PrZuDEH4HiLoqcKLykmJLMsM1f0LHaGs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730366717; x=1730971517; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CqSY6XKc+cFZ1v5HfdPsfl67/vM0PLwzt3YKJ3PRw7g=; b=uRXYAObuTu9trZ+EF+ZJguPCQnhj8wJmlxk+7+e3CJEn3lq38Q96Q5LCQIirijFoCD O9T9XfAG0Umqo59aIQatEsVF25JbDDJWhSfIMG575rtu9jZOE4pAgOIpyUXdeNWtFjbf JRGxOzF9FHUoGHpY1tMwcWSTNytukUMGTOk8XuBUf18RFhcXxl4pR/d5tQvqMGAG15o6 k4uYSEI9tcq+CA02rTpP5VtIduEWbJVAhYPa4dDsc3Y9cyLexcp2sqPl+eLYZTT21HJt xzY46LkT4VDRdq3e5qG0PNR4sCSTLrle91d+/XqYW8Vdc2dw83UspGGGJgZYB9X3gJFW 95Tg== X-Forwarded-Encrypted: i=1; AJvYcCUIpwYE5B7RYmceyZrVK81uZbS6hHGsI5hL2+qjKTZ3as4bqrFN0iy90G8+7cGOo5xGnAltgpTppoClKrs=@vger.kernel.org X-Gm-Message-State: AOJu0YzgQGGaOt5Ti/K7gowDFvSTQ7ej8n9v7AXWDSekoNGCY8WeDnZ6 YmlQ4o59uIjgYojj5/rinxPFd/hZAR/+OHFPIbh0a9mJqUC4Z0YzbUfxRQOMlQ== X-Google-Smtp-Source: AGHT+IHSZLPhBEGaCRISH7tJAGgBon4VwqZIu+GfJyLksx7o0ixDN7NL0Srt8FsUGUfPHe8ebYpJmA== X-Received: by 2002:a17:90b:197:b0:2e2:c7f8:8ba8 with SMTP id 98e67ed59e1d1-2e8f11c072cmr15518309a91.40.1730366716810; Thu, 31 Oct 2024 02:25:16 -0700 (PDT) Received: from li-cloudtop.c.googlers.com.com (51.193.125.34.bc.googleusercontent.com. [34.125.193.51]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e92fbe707fsm3074953a91.37.2024.10.31.02.25.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Oct 2024 02:25:16 -0700 (PDT) From: Li Li To: dualli@google.com, corbet@lwn.net, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, donald.hunter@gmail.com, gregkh@linuxfoundation.org, arve@android.com, tkjos@android.com, maco@android.com, joel@joelfernandes.org, brauner@kernel.org, cmllamas@google.com, surenb@google.com, arnd@arndb.de, masahiroy@kernel.org, bagasdotme@gmail.com, horms@kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, netdev@vger.kernel.org, hridya@google.com, smoreland@google.com Cc: kernel-team@android.com Subject: [PATCH net-next v7 2/2] binder: report txn errors via generic netlink Date: Thu, 31 Oct 2024 02:25:04 -0700 Message-ID: <20241031092504.840708-3-dualli@chromium.org> X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog In-Reply-To: <20241031092504.840708-1-dualli@chromium.org> References: <20241031092504.840708-1-dualli@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Li Li Frozen tasks can't process binder transactions, so sync binder transactions will fail with BR_FROZEN_REPLY and async binder transactions will be queued in the kernel async binder buffer. As these queued async transactions accumulates over time, the async buffer will eventually be running out, denying all new transactions after that with BR_FAILED_REPLY. In addition to the above cases, different kinds of binder error codes might be returned to the sender. However, the core Linux, or Android, system administration process never knows what's actually happening. Introduce generic netlink messages into the binder driver so that the Linux/Android system administration process can listen to important events and take corresponding actions, like stopping a broken app from attacking the OS by sending huge amount of spamming binder transactions. The new binder genl sources and headers are automatically generated from the corresponding binder_genl YAML spec. Don't modify them directly. Signed-off-by: Li Li --- Documentation/admin-guide/binder_genl.rst | 93 ++++++ Documentation/admin-guide/index.rst | 1 + Documentation/netlink/specs/binder_genl.yaml | 114 +++++++ drivers/android/Kconfig | 1 + drivers/android/Makefile | 2 +- drivers/android/binder.c | 313 ++++++++++++++++++- drivers/android/binder_genl.c | 38 +++ drivers/android/binder_genl.h | 18 ++ drivers/android/binder_internal.h | 22 ++ drivers/android/binder_trace.h | 35 +++ drivers/android/binderfs.c | 4 + include/uapi/linux/android/binder.h | 31 ++ include/uapi/linux/android/binder_genl.h | 56 ++++ 13 files changed, 720 insertions(+), 8 deletions(-) create mode 100644 Documentation/admin-guide/binder_genl.rst create mode 100644 Documentation/netlink/specs/binder_genl.yaml create mode 100644 drivers/android/binder_genl.c create mode 100644 drivers/android/binder_genl.h create mode 100644 include/uapi/linux/android/binder_genl.h diff --git a/Documentation/admin-guide/binder_genl.rst b/Documentation/admi= n-guide/binder_genl.rst new file mode 100644 index 000000000000..163b91dca83e --- /dev/null +++ b/Documentation/admin-guide/binder_genl.rst @@ -0,0 +1,93 @@ +.. SPDX-License-Identifier: GPL-2.0 + +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +Generic Netlink for the Android Binder Driver (Binder Genl) +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +The Generic Netlink subsystem in the Linux kernel provides a generic way f= or +the Linux kernel to communicate to the user space applications via binder +driver. It is used to report various kinds of binder transactions to user +space administration process. The driver allows multiple binder devices and +their corresponding binder contexts. Each context has an independent Gener= ic +Netlink for security reason. To prevent untrusted user applications from +accessing the netlink data, the kernel driver uses unicast mode instead of +multicast. + +Basically, the user space code uses the "set" command to request what kind +of binder transactions reported by the kernel binder driver. The driver th= en +uses "reply" command to acknowledge the request. The "set" command also +registers the current user space process to receive the reports. When the +user space process exits, the previous request will be reset to prevent any +potential leaks. + +Currently the driver can report binder transactions that "failed" to reach +the target process, or that are "delayed" due to the target process being +frozen by cgroup freezer, or that are considered "spam" according to exist= ing +logic in binder_alloc.c. + +When the specified binder transactions happen, the driver uses the "report" +command to send a generic netlink message to the registered process, +containing the payload struct binder_report. + +More details about the flags, attributes and operations can be found at the +the doc sections in Documentations/netlink/specs/binder_genl.yaml and the +kernel-doc comments of the new source code in binder.{h|c}. + +Using Binder Genl +----------------- + +The Binder Genl can be used in the same way as any other generic netlink +drivers. Userspace application uses a raw netlink socket to send commands +to and receive packets from the kernel driver. + +.. note:: + If the userspace application that talks to the driver exits, the kernel + driver will automatically reset the configuration to the default and + stop sending more reports to prevent leaking memory. + +Usage example (user space pseudo code): + +:: + + // open netlink socket + int fd =3D socket(AF_NETLINK, SOCK_RAW, NETLINK_GENERIC); + + // bind netlink socket + bind(fd, struct socketaddr); + + // get the family id of the binder genl + send(fd, CTRL_CMD_GETFAMILY, CTRL_ATTR_FAMILY_NAME, "binder"); + void *data =3D recv(CTRL_CMD_NEWFAMILY); + __u16 id =3D nla(data)[CTRL_ATTR_FAMILY_ID]; + + // enable per-context binder report + send(fd, id, BINDER_GENL_CMD_SET, 0, BINDER_GENL_FLAG_FAILED | + BINDER_GENL_FLAG_DELAYED); + + // confirm the per-context configuration + void *data =3D recv(fd, BINDER_GENL_CMD_REPLY); + __u32 pid =3D nla(data)[BINDER_GENL_A_CMD_PID]; + __u32 flags =3D nla(data)[BINDER_GENL_A_CMD_FLAGS]; + + // set optional per-process report, overriding the per-context one + send(fd, id, BINDER_GENL_CMD_SET, getpid(), + BINDER_GENL_FLAG_SPAM | BINDER_REPORT_OVERRIDE); + + // confirm the optional per-process configuration + void *data =3D recv(fd, BINDER_GENL_CMD_REPLY); + __u32 pid =3D nla(data)[BINDER_GENL_A_CMD_PID]; + __u32 flags =3D nla(data)[BINDER_GENL_A_CMD_FLAGS]; + + // wait and read all binder reports + while (running) { + void *data =3D recv(fd, BINDER_GENL_CMD_REPORT); + u32 *attr =3D nla(data)[BINDER_GENL_A_REPORT_XXX]; + + // process binder report + do_something(*attr); + } + + // clean up + send(fd, id, BINDER_GENL_CMD_SET, 0, 0); + send(fd, id, BINDER_GENL_CMD_SET, getpid(), 0); + close(fd); diff --git a/Documentation/admin-guide/index.rst b/Documentation/admin-guid= e/index.rst index e85b1adf5908..b3b5cfadffe5 100644 --- a/Documentation/admin-guide/index.rst +++ b/Documentation/admin-guide/index.rst @@ -79,6 +79,7 @@ configure specific aspects of kernel behavior to your lik= ing. aoe/index auxdisplay/index bcache + binder_genl binderfs binfmt-misc blockdev/index diff --git a/Documentation/netlink/specs/binder_genl.yaml b/Documentation/n= etlink/specs/binder_genl.yaml new file mode 100644 index 000000000000..35e5f0120fc7 --- /dev/null +++ b/Documentation/netlink/specs/binder_genl.yaml @@ -0,0 +1,114 @@ +# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Cla= use) + +name: binder_genl +protocol: genetlink +uapi-header: linux/android/binder_genl.h +doc: Netlink protocol to report binder transaction errors and warnings. + +definitions: + - + type: flags + name: flag + doc: | + Used with "set" and "reply" command below, defining what kind of bin= der + transactions reported to the user space administration process. + value-start: 0 + entries: [ failed, delayed, spam, override ] + +attribute-sets: + - + name: cmd + doc: The supported attributes of "set" and "reply" commands + attributes: + - + name: pid + type: u32 + doc: | + What binder proc or context to enable binder genl report, + used by "set" and "reply" command below. + - + name: flags + type: u32 + doc: | + What kind of binder transactions reported via binder genl, + used by "set" and "reply" command below. + - + name: report + doc: The supported attributes of "report" command + attributes: + - + name: err + type: u32 + doc: | + Copy of binder_driver_return_protocol returned to the sender, + used by "report" command below. + - + name: from_pid + type: u32 + doc: | + Sender pid of the corresponding binder transaction + used by "report" command below. + - + name: from_tid + type: u32 + doc: | + Sender tid of the corresponding binder transaction + used by "report" command below. + - + name: to_pid + type: u32 + doc: | + Target pid of the corresponding binder transaction + used by "report" command below. + - + name: to_tid + type: u32 + doc: | + Target tid of the corresponding binder transaction + used by "report" command below. + - + name: reply + type: u32 + doc: | + 1 means the transaction is a reply, 0 otherwise + used by "report" command below. + - + name: flags + type: u32 + doc: | + Copy of binder_transaction_data->flags + used by "report" command below. + - + name: code + type: u32 + doc: | + Copy of binder_transaction_data->code + used by "report" command below. + - + name: data_size + type: u32 + doc: | + Copy of binder_transaction_data->data_size + used by "report" command below. + +operations: + list: + - + name: set + doc: | + Set flags from user space, requesting what kinds of binder + transactions to report. + attribute-set: cmd + + do: + request: ¶ms + attributes: + - pid + - flags + reply: *params + - + name: reply + doc: Acknowledge the above "set" request, echoing the same params. + - + name: report + doc: Send the requested binder transaction reports to user space. diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig index 07aa8ae0a058..e2fa620934e2 100644 --- a/drivers/android/Kconfig +++ b/drivers/android/Kconfig @@ -4,6 +4,7 @@ menu "Android" config ANDROID_BINDER_IPC bool "Android Binder IPC Driver" depends on MMU + depends on NET default n help Binder is used in Android for both communication between processes, diff --git a/drivers/android/Makefile b/drivers/android/Makefile index c9d3d0c99c25..d818447fbc4c 100644 --- a/drivers/android/Makefile +++ b/drivers/android/Makefile @@ -2,5 +2,5 @@ ccflags-y +=3D -I$(src) # needed for trace events =20 obj-$(CONFIG_ANDROID_BINDERFS) +=3D binderfs.o -obj-$(CONFIG_ANDROID_BINDER_IPC) +=3D binder.o binder_alloc.o +obj-$(CONFIG_ANDROID_BINDER_IPC) +=3D binder.o binder_alloc.o binder_genl.o obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) +=3D binder_alloc_selftest.o diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 978740537a1a..140f1ffe9fe8 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -72,6 +72,7 @@ =20 #include =20 +#include "binder_genl.h" #include "binder_internal.h" #include "binder_trace.h" =20 @@ -2984,6 +2985,167 @@ static void binder_set_txn_from_error(struct binder= _transaction *t, int id, binder_thread_dec_tmpref(from); } =20 +/** + * binder_find_proc() - set binder report flags + * @pid: the target process + */ +static struct binder_proc *binder_find_proc(int pid) +{ + struct binder_proc *proc; + + mutex_lock(&binder_procs_lock); + hlist_for_each_entry(proc, &binder_procs, proc_node) { + if (proc->pid =3D=3D pid) { + mutex_unlock(&binder_procs_lock); + return proc; + } + } + mutex_unlock(&binder_procs_lock); + + return NULL; +} + +/** + * binder_genl_set_report() - set binder report flags + * @context: the binder context to set the flags + * @pid: the target process + * @flags: the flags to set + * + * If pid is 0, the flags are applied to the whole binder context. + * Otherwise, the flags are applied to the specific process only. + */ +static int binder_genl_set_report(struct binder_context *context, u32 pid, + u32 flags) +{ + struct binder_proc *proc; + + if (flags !=3D (flags & (BINDER_GENL_FLAG_OVERRIDE + | BINDER_GENL_FLAG_FAILED + | BINDER_GENL_FLAG_DELAYED + | BINDER_GENL_FLAG_SPAM))) { + pr_err("Invalid binder report flags: %u\n", flags); + return -EINVAL; + } + + if (!pid) { + /* Set the global flags for the whole binder context */ + context->report_flags =3D flags; + } else { + /* Set the per-process flags */ + proc =3D binder_find_proc(pid); + if (!proc) { + pr_err("Invalid binder report pid %u\n", pid); + return -EINVAL; + } + + proc->report_flags =3D flags; + } + + return 0; +} + +/** + * binder_genl_report_enabled() - check if binder genl reports are enabled + * @proc: the binder_proc to check + * @mask: the categories of binder genl reports + * + * Returns true if certain binder genl reports are enabled for this binder + * proc (when per-process overriding takes effect) or context. + */ +static bool binder_genl_report_enabled(struct binder_proc *proc, u32 mask) +{ + struct binder_context *context =3D proc->context; + + if (!context->report_portid) + return false; + + if (proc->report_flags & BINDER_GENL_FLAG_OVERRIDE) + return (proc->report_flags & mask) !=3D 0; + else + return (context->report_flags & mask) !=3D 0; +} + +/** + * binder_genl_send_report() - send one binder genl report + * @context: the binder context + * @err: copy of binder_driver_return_protocol returned to the sender + * @pid: sender process + * @tid: sender thread + * @to_pid: target process + * @to_tid: target thread + * @reply: whether the binder transaction is a reply + * @tr: the binder transaction data + * + * Packs the report data into a "report" binder genl message and send it. + */ +static void binder_genl_send_report(struct binder_context *context, u32 er= r, + u32 pid, u32 tid, u32 to_pid, u32 to_tid, + u32 reply, + struct binder_transaction_data *tr) +{ + int payload; + int ret; + struct sk_buff *skb; + void *hdr; + + trace_binder_send_report(context->name, err, pid, tid, to_pid, to_tid, + reply, tr); + + payload =3D nla_total_size(sizeof(u32)) * BINDER_GENL_A_REPORT_MAX; + skb =3D genlmsg_new(payload + GENL_HDRLEN, GFP_KERNEL); + if (!skb) { + pr_err("Failed to alloc binder genl message\n"); + return; + } + + hdr =3D genlmsg_put(skb, 0, atomic_inc_return(&context->report_seq), + &context->genl_family, 0, BINDER_GENL_CMD_REPORT); + if (!hdr) + goto free_skb; + + if (nla_put_u32(skb, BINDER_GENL_A_REPORT_ERR, err)) + goto cancel_skb; + + if (nla_put_u32(skb, BINDER_GENL_A_REPORT_FROM_PID, pid)) + goto cancel_skb; + + if (nla_put_u32(skb, BINDER_GENL_A_REPORT_FROM_TID, tid)) + goto cancel_skb; + + if (nla_put_u32(skb, BINDER_GENL_A_REPORT_TO_PID, to_pid)) + goto cancel_skb; + + if (nla_put_u32(skb, BINDER_GENL_A_REPORT_TO_TID, to_tid)) + goto cancel_skb; + + if (nla_put_u32(skb, BINDER_GENL_A_REPORT_REPLY, reply)) + goto cancel_skb; + + if (nla_put_u32(skb, BINDER_GENL_A_REPORT_FLAGS, tr->flags)) + goto cancel_skb; + + if (nla_put_u32(skb, BINDER_GENL_A_REPORT_CODE, tr->code)) + goto cancel_skb; + + if (nla_put_u32(skb, BINDER_GENL_A_REPORT_DATA_SIZE, tr->data_size)) + goto cancel_skb; + + genlmsg_end(skb, hdr); + + ret =3D genlmsg_unicast(&init_net, skb, context->report_portid); + if (ret < 0) + pr_err("Failed to send binder genl message to %d: %d\n", + context->report_portid, ret); + return; + +cancel_skb: + pr_err("Failed to add report attributes to binder genl message\n"); + genlmsg_cancel(skb, hdr); +free_skb: + pr_err("Free binder genl report message on error\n"); + nlmsg_free(skb); +} + static void binder_transaction(struct binder_proc *proc, struct binder_thread *thread, struct binder_transaction_data *tr, int reply, @@ -3678,10 +3840,18 @@ static void binder_transaction(struct binder_proc *= proc, return_error_line =3D __LINE__; goto err_copy_data_failed; } - if (t->buffer->oneway_spam_suspect) + if (t->buffer->oneway_spam_suspect) { tcomplete->type =3D BINDER_WORK_TRANSACTION_ONEWAY_SPAM_SUSPECT; - else + if (binder_genl_report_enabled(proc, BINDER_GENL_FLAG_SPAM)) + binder_genl_send_report(context, + BR_ONEWAY_SPAM_SUSPECT, + proc->pid, thread->pid, + target_proc ? target_proc->pid : 0, + target_thread ? target_thread->pid : 0, + reply, tr); + } else { tcomplete->type =3D BINDER_WORK_TRANSACTION_COMPLETE; + } t->work.type =3D BINDER_WORK_TRANSACTION; =20 if (reply) { @@ -3731,8 +3901,15 @@ static void binder_transaction(struct binder_proc *p= roc, * process and is put in a pending queue, waiting for the target * process to be unfrozen. */ - if (return_error =3D=3D BR_TRANSACTION_PENDING_FROZEN) + if (return_error =3D=3D BR_TRANSACTION_PENDING_FROZEN) { tcomplete->type =3D BINDER_WORK_TRANSACTION_PENDING; + if (binder_genl_report_enabled(proc, BINDER_GENL_FLAG_DELAYED)) + binder_genl_send_report(context, return_error, + proc->pid, thread->pid, + target_proc ? target_proc->pid : 0, + target_thread ? target_thread->pid : 0, + reply, tr); + } binder_enqueue_thread_work(thread, tcomplete); if (return_error && return_error !=3D BR_TRANSACTION_PENDING_FROZEN) @@ -3794,6 +3971,13 @@ static void binder_transaction(struct binder_proc *p= roc, binder_dec_node_tmpref(target_node); } =20 + if (binder_genl_report_enabled(proc, BINDER_GENL_FLAG_FAILED)) + binder_genl_send_report(context, return_error, + proc->pid, thread->pid, + target_proc ? target_proc->pid : 0, + target_thread ? target_thread->pid : 0, + reply, tr); + binder_debug(BINDER_DEBUG_FAILED_TRANSACTION, "%d:%d transaction %s to %d:%d failed %d/%d/%d, size %lld-%lld line= %d\n", proc->pid, thread->pid, reply ? "reply" : @@ -6114,6 +6298,11 @@ static int binder_release(struct inode *nodp, struct= file *filp) =20 binder_defer_work(proc, BINDER_DEFERRED_RELEASE); =20 + if (proc->pid =3D=3D proc->context->report_portid) { + proc->context->report_portid =3D 0; + proc->context->report_flags =3D 0; + } + return 0; } =20 @@ -6311,6 +6500,83 @@ binder_defer_work(struct binder_proc *proc, enum bin= der_deferred_state defer) mutex_unlock(&binder_deferred_lock); } =20 +/** + * binder_genl_nl_set_doit() - .doit handler for BINDER_GENL_CMD_SET + * @skb: the metadata struct passed from netlink driver + * @info: the generic netlink struct passed from netlink driver + * + * Implements the .doit function to process binder genl commands. + */ +int binder_genl_nl_set_doit(struct sk_buff *skb, struct genl_info *info) +{ + int payload; + int portid; + u32 pid; + u32 flags; + void *hdr; + struct binder_context *context; + + /* Both attributes are required for BINDER_GENL_CMD_SET */ + if (!info->attrs[BINDER_GENL_A_CMD_PID] || !info->attrs[BINDER_GENL_A_CMD= _FLAGS]) { + pr_err("Attributes not set\n"); + return -EINVAL; + } + + portid =3D nlmsg_hdr(skb)->nlmsg_pid; + pid =3D nla_get_u32(info->attrs[BINDER_GENL_A_CMD_PID]); + flags =3D nla_get_u32(info->attrs[BINDER_GENL_A_CMD_FLAGS]); + context =3D container_of(info->family, struct binder_context, + genl_family); + + if (context->report_portid && context->report_portid !=3D portid) { + pr_err("No permission to set report flags from %u\n", portid); + return -EPERM; + } + + if (binder_genl_set_report(context, pid, flags) < 0) { + pr_err("Failed to set report flags %u for %u\n", flags, pid); + return -EINVAL; + } + + payload =3D nla_total_size(sizeof(pid)) + nla_total_size(sizeof(flags)); + skb =3D genlmsg_new(payload + GENL_HDRLEN, GFP_KERNEL); + if (!skb) { + pr_err("Failed to alloc binder genl reply message\n"); + return -ENOMEM; + } + + hdr =3D genlmsg_put_reply(skb, info, info->family, 0, + BINDER_GENL_CMD_REPLY); + if (!hdr) + goto free_skb; + + if (nla_put_u32(skb, BINDER_GENL_A_CMD_PID, pid)) + goto cancel_skb; + + if (nla_put_u32(skb, BINDER_GENL_A_CMD_FLAGS, flags)) + goto cancel_skb; + + genlmsg_end(skb, hdr); + + if (genlmsg_reply(skb, info)) { + pr_err("Failed to send binder genl reply message\n"); + return -EFAULT; + } + + if (!context->report_portid) + context->report_portid =3D portid; + + return 0; + +cancel_skb: + pr_err("Failed to add reply attributes to binder genl message\n"); + genlmsg_cancel(skb, hdr); +free_skb: + pr_err("Free binder genl reply message on error\n"); + nlmsg_free(skb); + return -EMSGSIZE; +} + static void print_binder_transaction_ilocked(struct seq_file *m, struct binder_proc *proc, const char *prefix, @@ -6894,6 +7160,28 @@ const struct binder_debugfs_entry binder_debugfs_ent= ries[] =3D { {} /* terminator */ }; =20 +/** + * binder_genl_init() - initialize binder generic netlink + * @family: the generic netlink family + * @name: the binder device name + * + * Registers the binder generic netlink family. + */ +int binder_genl_init(struct genl_family *family, const char *name) +{ + int ret; + + memcpy(family, &binder_genl_nl_family, sizeof(*family)); + strscpy(family->name, name, GENL_NAMSIZ); + ret =3D genl_register_family(family); + if (ret) { + pr_err("Failed to register binder genl: %s\n", name); + return ret; + } + + return 0; +} + static int __init init_binder_device(const char *name) { int ret; @@ -6913,13 +7201,24 @@ static int __init init_binder_device(const char *na= me) mutex_init(&binder_device->context.context_mgr_node_lock); =20 ret =3D misc_register(&binder_device->miscdev); - if (ret < 0) { - kfree(binder_device); - return ret; - } + if (ret < 0) + goto err_free_dev; + + binder_device->context.report_seq =3D (atomic_t)ATOMIC_INIT(0); + ret =3D binder_genl_init(&binder_device->context.genl_family, name); + if (ret < 0) + goto err_misc_deregister; =20 hlist_add_head(&binder_device->hlist, &binder_devices); =20 + return ret; + +err_misc_deregister: + misc_deregister(&binder_device->miscdev); + +err_free_dev: + kfree(binder_device); + return ret; } =20 diff --git a/drivers/android/binder_genl.c b/drivers/android/binder_genl.c new file mode 100644 index 000000000000..f100a6c49f38 --- /dev/null +++ b/drivers/android/binder_genl.c @@ -0,0 +1,38 @@ +// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Cl= ause) +/* Do not edit directly, auto-generated from: */ +/* Documentation/netlink/specs/binder_genl.yaml */ +/* YNL-GEN kernel source */ + +#include +#include + +#include "binder_genl.h" + +#include + +/* BINDER_GENL_CMD_SET - do */ +static const struct nla_policy binder_genl_set_nl_policy[BINDER_GENL_A_CMD= _FLAGS + 1] =3D { + [BINDER_GENL_A_CMD_PID] =3D { .type =3D NLA_U32, }, + [BINDER_GENL_A_CMD_FLAGS] =3D { .type =3D NLA_U32, }, +}; + +/* Ops table for binder_genl */ +static const struct genl_split_ops binder_genl_nl_ops[] =3D { + { + .cmd =3D BINDER_GENL_CMD_SET, + .doit =3D binder_genl_nl_set_doit, + .policy =3D binder_genl_set_nl_policy, + .maxattr =3D BINDER_GENL_A_CMD_FLAGS, + .flags =3D GENL_CMD_CAP_DO, + }, +}; + +struct genl_family binder_genl_nl_family __ro_after_init =3D { + .name =3D BINDER_GENL_FAMILY_NAME, + .version =3D BINDER_GENL_FAMILY_VERSION, + .netnsok =3D true, + .parallel_ops =3D true, + .module =3D THIS_MODULE, + .split_ops =3D binder_genl_nl_ops, + .n_split_ops =3D ARRAY_SIZE(binder_genl_nl_ops), +}; diff --git a/drivers/android/binder_genl.h b/drivers/android/binder_genl.h new file mode 100644 index 000000000000..9d68c155b7c4 --- /dev/null +++ b/drivers/android/binder_genl.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Cl= ause) */ +/* Do not edit directly, auto-generated from: */ +/* Documentation/netlink/specs/binder_genl.yaml */ +/* YNL-GEN kernel header */ + +#ifndef _LINUX_BINDER_GENL_GEN_H +#define _LINUX_BINDER_GENL_GEN_H + +#include +#include + +#include + +int binder_genl_nl_set_doit(struct sk_buff *skb, struct genl_info *info); + +extern struct genl_family binder_genl_nl_family; + +#endif /* _LINUX_BINDER_GENL_GEN_H */ diff --git a/drivers/android/binder_internal.h b/drivers/android/binder_int= ernal.h index f8d6be682f23..4abc8e3940c3 100644 --- a/drivers/android/binder_internal.h +++ b/drivers/android/binder_internal.h @@ -12,15 +12,32 @@ #include #include #include +#include #include #include "binder_alloc.h" #include "dbitmap.h" =20 +/** + * struct binder_context - information about a binder domain + * @binder_context_mgr_node: the context manager + * @context_mgr_node_lock: the lock protecting the above context manager= node + * @binder_context_mgr_uid: the uid of the above context manager + * @name: the name of the binder device + * @genl_family: the generic netlink family + * @report_portid: the netlink socket to receive binder reports + * @report_flags: the categories of binder transactions that wo= uld + * be reported (see enum binder_report_flag). + * @report_seq: the seq number of the generic netlink report + */ struct binder_context { struct binder_node *binder_context_mgr_node; struct mutex context_mgr_node_lock; kuid_t binder_context_mgr_uid; const char *name; + struct genl_family genl_family; + u32 report_portid; + u32 report_flags; + atomic_t report_seq; }; =20 /** @@ -415,6 +432,8 @@ struct binder_ref { * @binderfs_entry: process-specific binderfs log file * @oneway_spam_detection_enabled: process enabled oneway spam detection * or not + * @report_flags: the categories of binder transactions that would + * be reported (see enum binder_report_flag). * * Bookkeeping structure for binder processes */ @@ -453,6 +472,7 @@ struct binder_proc { spinlock_t outer_lock; struct dentry *binderfs_entry; bool oneway_spam_detection_enabled; + u32 report_flags; }; =20 /** @@ -582,4 +602,6 @@ struct binder_object { }; }; =20 +int binder_genl_init(struct genl_family *family, const char *name); + #endif /* _LINUX_BINDER_INTERNAL_H */ diff --git a/drivers/android/binder_trace.h b/drivers/android/binder_trace.h index fe38c6fc65d0..551b6c9d9f73 100644 --- a/drivers/android/binder_trace.h +++ b/drivers/android/binder_trace.h @@ -423,6 +423,41 @@ TRACE_EVENT(binder_return, "unknown") ); =20 +TRACE_EVENT(binder_send_report, + TP_PROTO(const char *name, u32 err, u32 pid, u32 tid, u32 to_pid, + u32 to_tid, u32 reply, struct binder_transaction_data *tr), + TP_ARGS(name, err, pid, tid, to_pid, to_tid, reply, tr), + TP_STRUCT__entry( + __field(const char *, name) + __field(u32, err) + __field(u32, pid) + __field(u32, tid) + __field(u32, to_pid) + __field(u32, to_tid) + __field(u32, reply) + __field(u32, flags) + __field(u32, code) + __field(binder_size_t, data_size) + ), + TP_fast_assign( + __entry->name =3D name; + __entry->err =3D err; + __entry->pid =3D pid; + __entry->tid =3D tid; + __entry->to_pid =3D to_pid; + __entry->to_tid =3D to_tid; + __entry->reply =3D reply; + __entry->flags =3D tr->flags; + __entry->code =3D tr->code; + __entry->data_size =3D tr->data_size; + ), + TP_printk("%s: %d %d:%d -> %d:%d %s flags=3D0x08%x code=3D%d %llu", + __entry->name, __entry->err, __entry->pid, __entry->tid, + __entry->to_pid, __entry->to_tid, + __entry->reply ? "reply" : "", + __entry->flags, __entry->code, __entry->data_size) +); + #endif /* _BINDER_TRACE_H */ =20 #undef TRACE_INCLUDE_PATH diff --git a/drivers/android/binderfs.c b/drivers/android/binderfs.c index ad1fa7abc323..b2c5b04bf2ab 100644 --- a/drivers/android/binderfs.c +++ b/drivers/android/binderfs.c @@ -207,6 +207,10 @@ static int binderfs_binder_device_create(struct inode = *ref_inode, fsnotify_create(root->d_inode, dentry); inode_unlock(d_inode(root)); =20 + ret =3D binder_genl_init(&device->context.genl_family, name); + if (ret < 0) + goto err; + return 0; =20 err: diff --git a/include/uapi/linux/android/binder.h b/include/uapi/linux/andro= id/binder.h index 1fd92021a573..d95776448db9 100644 --- a/include/uapi/linux/android/binder.h +++ b/include/uapi/linux/android/binder.h @@ -588,5 +588,36 @@ enum binder_driver_command_protocol { */ }; =20 +/* + * struct binder_report - reports an abnormal binder transaction + * @err: copy of binder_driver_return_protocol returned to the sender + * @from_pid: sender pid of the corresponding binder transaction + * @from_tid: sender tid of the corresponding binder transaction + * @to_pid: target pid of the corresponding binder transaction + * @to_tid: target tid of the corresponding binder transaction + * @reply: 1 means the txn is a reply, 0 otherwise + * @flags: copy of binder_transaction_data->flags + * @code: copy of binder_transaction_data->code + * @data_size: copy of binder_transaction_data->data_size + * + * When a binder transaction fails to reach the target process or is not + * delivered on time, an error command BR_XXX is returned from the kernel + * binder driver to the user space sender. This is considered an abnormal + * binder transaction. The most important information about this abnormal + * binder transaction will be packed into this binder_report struct and se= nt + * to the registered user space administration process via generic netlink. + */ +struct binder_report { + __u32 err; + __u32 from_pid; + __u32 from_tid; + __u32 to_pid; + __u32 to_tid; + __u32 reply; + __u32 flags; + __u32 code; + binder_size_t data_size; +}; + #endif /* _UAPI_LINUX_BINDER_H */ =20 diff --git a/include/uapi/linux/android/binder_genl.h b/include/uapi/linux/= android/binder_genl.h new file mode 100644 index 000000000000..2c48c9c967f6 --- /dev/null +++ b/include/uapi/linux/android/binder_genl.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Cl= ause) */ +/* Do not edit directly, auto-generated from: */ +/* Documentation/netlink/specs/binder_genl.yaml */ +/* YNL-GEN uapi header */ + +#ifndef _UAPI_LINUX_ANDROID_BINDER_GENL_H +#define _UAPI_LINUX_ANDROID_BINDER_GENL_H + +#define BINDER_GENL_FAMILY_NAME "binder_genl" +#define BINDER_GENL_FAMILY_VERSION 1 + +/** + * enum binder_genl_flag - Used with "set" and "reply" command below, defi= ning + * what kind of binder transactions reported to the user space administr= ation + * process. + */ +enum binder_genl_flag { + BINDER_GENL_FLAG_FAILED =3D 1, + BINDER_GENL_FLAG_DELAYED =3D 2, + BINDER_GENL_FLAG_SPAM =3D 4, + BINDER_GENL_FLAG_OVERRIDE =3D 8, +}; + +enum { + BINDER_GENL_A_CMD_PID =3D 1, + BINDER_GENL_A_CMD_FLAGS, + + __BINDER_GENL_A_CMD_MAX, + BINDER_GENL_A_CMD_MAX =3D (__BINDER_GENL_A_CMD_MAX - 1) +}; + +enum { + BINDER_GENL_A_REPORT_ERR =3D 1, + BINDER_GENL_A_REPORT_FROM_PID, + BINDER_GENL_A_REPORT_FROM_TID, + BINDER_GENL_A_REPORT_TO_PID, + BINDER_GENL_A_REPORT_TO_TID, + BINDER_GENL_A_REPORT_REPLY, + BINDER_GENL_A_REPORT_FLAGS, + BINDER_GENL_A_REPORT_CODE, + BINDER_GENL_A_REPORT_DATA_SIZE, + + __BINDER_GENL_A_REPORT_MAX, + BINDER_GENL_A_REPORT_MAX =3D (__BINDER_GENL_A_REPORT_MAX - 1) +}; + +enum { + BINDER_GENL_CMD_SET =3D 1, + BINDER_GENL_CMD_REPLY, + BINDER_GENL_CMD_REPORT, + + __BINDER_GENL_CMD_MAX, + BINDER_GENL_CMD_MAX =3D (__BINDER_GENL_CMD_MAX - 1) +}; + +#endif /* _UAPI_LINUX_ANDROID_BINDER_GENL_H */ --=20 2.47.0.163.g1226f6d8fa-goog