Merge branch 'master' into sysfs

Pulls in the 2.2 release stuff.

Signed-off-by: Greg Kroah-Hartman <[email protected]>

Author: gregkh

AUTHORS

@@ -1,5 +1,5 @@
 -- AUTHORS for USBView - a USB device viewer
--- Copyright (c) 1999-2012, 2021 by Greg Kroah-Hartman, [email protected]
+-- Copyright (c) 1999-2012, 2021-2022 by Greg Kroah-Hartman, [email protected]
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by

ChangeLog

@@ -1,3 +1,8 @@
+version 2.2
+	- security issue fixed with polkit (CVE-2022-23220).
+	- copyright year fixups and updates
+	- tooltip added to explain red devices have no attached drivers
+
 version 2.1
 	- build warnings fixed
 	- increased max number of interfaces allowed, fixing problem with some

README

@@ -1,5 +1,5 @@
 -- README for USBView - a USB device viewer
--- Copyright (c) 1999-2012, 2021 by Greg Kroah-Hartman, [email protected]
+-- Copyright (c) 1999-2012, 2021-2022 by Greg Kroah-Hartman, [email protected]
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by

callbacks.c

@@ -45,7 +45,7 @@ void on_buttonAbout_clicked (GtkButton *button, gpointer user_data)
 		"comments", "Display information on USB devices",
 		"website-label", "http://www.kroah.com/linux-usb/",
 		"website", "http://www.kroah.com/linux-usb/",
-		"copyright", "Copyright © 1999-2012, 2021",
+		"copyright", "Copyright © 1999-2012, 2021-2022",
 		"authors", authors,
 		NULL);
 	g_object_unref (logo);

configure.ac

@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 # Prologue.
 
 AC_PREREQ([2.69])
-AC_INIT([USBView],[2.1],[Greg Kroah-Hartman <[email protected]>],[usbview],[http://www.kroah.com/linux-usb/])
+AC_INIT([USBView],[2.2],[Greg Kroah-Hartman <[email protected]>],[usbview],[http://www.kroah.com/linux-usb/])
 AC_CONFIG_SRCDIR([usbtree.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign subdir-objects -Wall])

main.c

@@ -7,15 +7,20 @@
 	#include <config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <gtk/gtk.h>
 
 #include "usbtree.h"
 
 int main (int argc, char *argv[])
 {
 	GtkWidget *window1;
+	gboolean is_pkexec = getenv("PKEXEC_UID") != NULL;
 
-	gtk_init (&argc, &argv);
+	// only evalute command line parameters if not running in pkexec
+	// privilege escalation context to avoid potential attack vectors
+	gtk_init (is_pkexec ? NULL : &argc, is_pkexec ? NULL : &argv);
 
 	initialize_stuff();
 

org.freedesktop.pkexec.usbview.policy

@@ -8,8 +8,8 @@
     <message>Authentication is required to view USB bus</message>
     <icon_name>usbview_icon</icon_name>
     <defaults>
-      <allow_any>yes</allow_any>
-      <allow_inactive>yes</allow_inactive>
+      <allow_any>no</allow_any>
+      <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
     </defaults>
     <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/usbview</annotate>