Browse code

kernels: disable CONFIG_FANOTIFY_ACCESS_PERMISSIONS

One of LTP tests triggered kernel hang caused by incorrect
fanotify permission events handling.

Upstream fixes are available, but not yet backported.
- Kernel crashes should be fixed by:
96d41019e3ac “fanotify: fix list corruption in fanotify_get_response()”
- Kernel hangs should be fixed by:
05f0e38724e8 “fanotify: Release SRCU lock when waiting for userspace response”

Disable this feature for now.

Change-Id: I7032286a1723caa7319680bffbb43a3465c757a5
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6513
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Srivatsa S. Bhat <srivatsab@vmware.com>

Alexey Makhalov authored on 2019/01/16 09:51:11
Showing 6 changed files
... ...
@@ -4412,7 +4412,7 @@ CONFIG_FSNOTIFY=y
4412 4412
 CONFIG_DNOTIFY=y
4413 4413
 CONFIG_INOTIFY_USER=y
4414 4414
 CONFIG_FANOTIFY=y
4415
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
4415
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
4416 4416
 CONFIG_QUOTA=y
4417 4417
 CONFIG_QUOTA_NETLINK_INTERFACE=y
4418 4418
 # CONFIG_PRINT_QUOTA_WARNING is not set
... ...
@@ -3454,7 +3454,7 @@ CONFIG_FSNOTIFY=y
3454 3454
 CONFIG_DNOTIFY=y
3455 3455
 CONFIG_INOTIFY_USER=y
3456 3456
 CONFIG_FANOTIFY=y
3457
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
3457
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
3458 3458
 CONFIG_QUOTA=y
3459 3459
 CONFIG_QUOTA_NETLINK_INTERFACE=y
3460 3460
 # CONFIG_PRINT_QUOTA_WARNING is not set
... ...
@@ -3868,7 +3868,7 @@ CONFIG_FSNOTIFY=y
3868 3868
 CONFIG_DNOTIFY=y
3869 3869
 CONFIG_INOTIFY_USER=y
3870 3870
 CONFIG_FANOTIFY=y
3871
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
3871
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
3872 3872
 CONFIG_QUOTA=y
3873 3873
 CONFIG_QUOTA_NETLINK_INTERFACE=y
3874 3874
 # CONFIG_PRINT_QUOTA_WARNING is not set
... ...
@@ -2,7 +2,7 @@
2 2
 Summary:        Kernel
3 3
 Name:           linux-aws
4 4
 Version:        4.9.140
5
-Release:        1%{?kat_build:.%kat_build}%{?dist}
5
+Release:        2%{?kat_build:.%kat_build}%{?dist}
6 6
 License:    	GPLv2
7 7
 URL:        	http://www.kernel.org/
8 8
 Group:        	System Environment/Kernel
... ...
@@ -380,17 +380,17 @@ make -C tools JOBS=1 DESTDIR=%{buildroot} prefix=%{_prefix} perf_install
380 380
 %include %{SOURCE2}
381 381
 
382 382
 %post
383
-/sbin/depmod -aq %{uname_r}
383
+/sbin/depmod -a %{uname_r}
384 384
 ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg
385 385
 
386 386
 %post drivers-gpu
387
-/sbin/depmod -aq %{uname_r}
387
+/sbin/depmod -a %{uname_r}
388 388
 
389 389
 %post sound
390
-/sbin/depmod -aq %{uname_r}
390
+/sbin/depmod -a %{uname_r}
391 391
 
392 392
 %post oprofile
393
-/sbin/depmod -aq %{uname_r}
393
+/sbin/depmod -a %{uname_r}
394 394
 
395 395
 %files
396 396
 %defattr(-,root,root)
... ...
@@ -440,6 +440,9 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg
440 440
 /usr/share/doc/*
441 441
 
442 442
 %changelog
443
+*   Tue Jan 15 2019 Alexey Makhalov <amakhalov@vmware.com> 4.9.140-2
444
+-   .config: disable CONFIG_FANOTIFY_ACCESS_PERMISSIONS
445
+-   Removed deprecated -q option for depmod
443 446
 *   Mon Nov 26 2018 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.9.140-1
444 447
 -   Update to version 4.9.140
445 448
 *   Fri Nov 16 2018 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.9.137-1
... ...
@@ -2,7 +2,7 @@
2 2
 Summary:        Kernel
3 3
 Name:           linux-secure
4 4
 Version:        4.9.140
5
-Release:        2%{?kat_build:.%kat_build}%{?dist}
5
+Release:        3%{?kat_build:.%kat_build}%{?dist}
6 6
 License:        GPLv2
7 7
 URL:            http://www.kernel.org/
8 8
 Group:          System Environment/Kernel
... ...
@@ -331,6 +331,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
331 331
 /usr/src/linux-headers-%{uname_r}
332 332
 
333 333
 %changelog
334
+*   Tue Jan 15 2019 Alexey Makhalov <amakhalov@vmware.com> 4.9.140-3
335
+-   .config: disable CONFIG_FANOTIFY_ACCESS_PERMISSIONS
334 336
 *   Thu Dec 20 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.140-2
335 337
 -   .config: CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
336 338
 *   Mon Nov 26 2018 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.9.140-1
... ...
@@ -2,7 +2,7 @@
2 2
 Summary:        Kernel
3 3
 Name:           linux
4 4
 Version:        4.9.140
5
-Release:        3%{?kat_build:.%kat_build}%{?dist}
5
+Release:        4%{?kat_build:.%kat_build}%{?dist}
6 6
 License:    	GPLv2
7 7
 URL:        	http://www.kernel.org/
8 8
 Group:        	System Environment/Kernel
... ...
@@ -372,6 +372,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg
372 372
 /usr/share/doc/*
373 373
 
374 374
 %changelog
375
+*   Tue Jan 15 2019 Alexey Makhalov <amakhalov@vmware.com> 4.9.140-4
376
+-   .config: disable CONFIG_FANOTIFY_ACCESS_PERMISSIONS
375 377
 *   Thu Dec 20 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.140-3
376 378
 -   .config: CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
377 379
 -   Removed deprecated -q option for depmod