linux-kernel - Re: [PATCH 3/3] kdbus: optimize if statements in kdbus_conn

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 17 Jun 2015 19:27:22 +0200
From:	David Herrmann <dh.herrmann@...il.com>
To:	Sergei Zviagintsev <sergei@...v.net>
Cc:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Daniel Mack <daniel@...que.org>,
	David Herrmann <dh.herrmann@...glemail.com>,
	Djalal Harouni <tixxdz@...ndz.org>,
	linux-kernel <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 3/3] kdbus: optimize if statements in kdbus_conn_disconnect()

Hi

On Wed, Jun 17, 2015 at 7:14 PM, Sergei Zviagintsev <sergei@...v.net> wrote:
> if (r->sync) branch and code after it both call kdbus_reply_unlink().
> Rewrite them as if-else to eliminate code duplication and make algorithm
> more obvious.
>
> Convert outer if statement to use continue in order to reduce
> indentation and make things easier to read.
>
> Signed-off-by: Sergei Zviagintsev <sergei@...v.net>
> ---
>  ipc/kdbus/connection.c | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)

Reviewed-by: David Herrmann <dh.herrmann@...il.com>

Thanks
David

> diff --git a/ipc/kdbus/connection.c b/ipc/kdbus/connection.c
> index 707be050b408..9993753d11de 100644
> --- a/ipc/kdbus/connection.c
> +++ b/ipc/kdbus/connection.c
> @@ -559,17 +559,16 @@ int kdbus_conn_disconnect(struct kdbus_conn *conn, bool ensure_queue_empty)
>         hash_for_each(bus->conn_hash, i, c, hentry) {
>                 mutex_lock(&c->lock);
>                 list_for_each_entry_safe(r, r_tmp, &c->reply_list, entry) {
> -                       if (r->reply_src == conn) {
> -                               if (r->sync) {
> -                                       kdbus_sync_reply_wakeup(r, -EPIPE);
> -                                       kdbus_reply_unlink(r);
> -                                       continue;
> -                               }
> +                       if (r->reply_src != conn)
> +                               continue;
>
> +                       if (r->sync)
> +                               kdbus_sync_reply_wakeup(r, -EPIPE);
> +                       else
>                                 /* send a 'connection dead' notification */
>                                 kdbus_notify_reply_dead(bus, c->id, r->cookie);
> -                               kdbus_reply_unlink(r);
> -                       }
> +
> +                       kdbus_reply_unlink(r);
>                 }
>                 mutex_unlock(&c->lock);
>         }
> --
> 1.8.3.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/