-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathlinux-4.1.15-sbox.patch
4205 lines (3802 loc) · 124 KB
/
linux-4.1.15-sbox.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -ruNp linux-4.1.16/arch/x86/ia32/sys_ia32.c linux-4.1.16-cher1/arch/x86/ia32/sys_ia32.c
--- linux-4.1.16/arch/x86/ia32/sys_ia32.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/arch/x86/ia32/sys_ia32.c 2016-01-28 22:15:57.117291741 +0300
@@ -95,12 +95,26 @@ static int cp_stat64(struct stat64 __use
return 0;
}
+int cher_patch_is_secure_path(const char *);
+
asmlinkage long sys32_stat64(const char __user *filename,
struct stat64 __user *statbuf)
{
struct kstat stat;
- int ret = vfs_stat(filename, &stat);
+ int ret = 0;
+
+ if (SBOX_IS_RESTRICTED()) {
+ struct filename *tmp = getname(filename);
+ if (IS_ERR(tmp)) return -EINVAL;
+ if (cher_patch_is_secure_path(tmp->name) < 0) {
+ putname(tmp);
+ return -EPERM;
+ }
+ if (!strncmp(tmp->name, "/SANDBOX/", 9)) filename += 9;
+ putname(tmp);
+ }
+ ret = vfs_stat(filename, &stat);
if (!ret)
ret = cp_stat64(statbuf, &stat);
return ret;
@@ -110,7 +124,20 @@ asmlinkage long sys32_lstat64(const char
struct stat64 __user *statbuf)
{
struct kstat stat;
- int ret = vfs_lstat(filename, &stat);
+ int ret = 0;
+
+ if (SBOX_IS_RESTRICTED()) {
+ struct filename *tmp = getname(filename);
+ if (IS_ERR(tmp)) return -EINVAL;
+ if (cher_patch_is_secure_path(tmp->name) < 0) {
+ putname(tmp);
+ return -EPERM;
+ }
+ if (!strncmp(tmp->name, "/SANDBOX/", 9)) filename += 9;
+ putname(tmp);
+ }
+
+ ret = vfs_lstat(filename, &stat);
if (!ret)
ret = cp_stat64(statbuf, &stat);
return ret;
@@ -131,6 +158,10 @@ asmlinkage long sys32_fstatat(unsigned i
struct kstat stat;
int error;
+ if (SBOX_IS_RESTRICTED()) {
+ return -EPERM;
+ }
+
error = vfs_fstatat(dfd, filename, &stat, flag);
if (error)
return error;
diff -ruNp linux-4.1.16/arch/x86/kernel/ioport.c linux-4.1.16-cher1/arch/x86/kernel/ioport.c
--- linux-4.1.16/arch/x86/kernel/ioport.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/arch/x86/kernel/ioport.c 2016-01-28 22:15:57.119291751 +0300
@@ -26,6 +26,11 @@ asmlinkage long sys_ioperm(unsigned long
struct tss_struct *tss;
unsigned int i, max_long, bytes, bytes_updated;
+ if (SBOX_IS_RESTRICTED()) {
+ //SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
return -EINVAL;
if (turn_on && !capable(CAP_SYS_RAWIO))
@@ -99,6 +104,11 @@ SYSCALL_DEFINE1(iopl, unsigned int, leve
unsigned int old = (regs->flags >> 12) & 3;
struct thread_struct *t = ¤t->thread;
+ if (SBOX_IS_RESTRICTED()) {
+ //SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
if (level > 3)
return -EINVAL;
/* Trying to gain more privileges? */
diff -ruNp linux-4.1.16/arch/x86/kernel/ldt.c linux-4.1.16-cher1/arch/x86/kernel/ldt.c
--- linux-4.1.16/arch/x86/kernel/ldt.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/arch/x86/kernel/ldt.c 2016-01-28 22:15:57.119291751 +0300
@@ -276,6 +276,11 @@ asmlinkage int sys_modify_ldt(int func,
{
int ret = -ENOSYS;
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
switch (func) {
case 0:
ret = read_ldt(ptr, bytecount);
diff -ruNp linux-4.1.16/arch/x86/kernel/vm86_32.c linux-4.1.16-cher1/arch/x86/kernel/vm86_32.c
--- linux-4.1.16/arch/x86/kernel/vm86_32.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/arch/x86/kernel/vm86_32.c 2016-01-28 22:15:57.121291761 +0300
@@ -212,6 +212,11 @@ SYSCALL_DEFINE1(vm86old, struct vm86_str
struct task_struct *tsk = current;
int tmp;
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
if (tsk->thread.saved_sp0)
return -EPERM;
tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
@@ -238,6 +243,11 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd
int tmp;
struct vm86plus_struct __user *v86;
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
tsk = current;
switch (cmd) {
case VM86_REQUEST_IRQ:
diff -ruNp linux-4.1.16/fs/aio.c linux-4.1.16-cher1/fs/aio.c
--- linux-4.1.16/fs/aio.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/aio.c 2016-01-28 22:15:57.128291797 +0300
@@ -1310,6 +1310,9 @@ SYSCALL_DEFINE2(io_setup, unsigned, nr_e
unsigned long ctx;
long ret;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
ret = get_user(ctx, ctxp);
if (unlikely(ret))
goto out;
@@ -1342,9 +1345,16 @@ out:
*/
SYSCALL_DEFINE1(io_destroy, aio_context_t, ctx)
{
- struct kioctx *ioctx = lookup_ioctx(ctx);
+ struct kioctx *ioctx = NULL;
+
+ if (SBOX_IS_RESTRICTED()) {
+ return -EPERM;
+ }
+
+ ioctx = lookup_ioctx(ctx);
if (likely(NULL != ioctx)) {
struct ctx_rq_wait wait;
+
int ret;
init_completion(&wait.comp);
@@ -1628,6 +1638,9 @@ long do_io_submit(aio_context_t ctx_id,
SYSCALL_DEFINE3(io_submit, aio_context_t, ctx_id, long, nr,
struct iocb __user * __user *, iocbpp)
{
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
return do_io_submit(ctx_id, nr, iocbpp, 0);
}
@@ -1670,6 +1683,9 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t
u32 key;
int ret;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
ret = get_user(key, &iocb->aio_key);
if (unlikely(ret))
return -EFAULT;
@@ -1720,9 +1736,13 @@ SYSCALL_DEFINE5(io_getevents, aio_contex
struct io_event __user *, events,
struct timespec __user *, timeout)
{
- struct kioctx *ioctx = lookup_ioctx(ctx_id);
+ struct kioctx *ioctx;
long ret = -EINVAL;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
+ ioctx = lookup_ioctx(ctx_id);
if (likely(ioctx)) {
if (likely(min_nr <= nr && min_nr >= 0))
ret = read_events(ioctx, min_nr, nr, events, timeout);
diff -ruNp linux-4.1.16/fs/buffer.c linux-4.1.16-cher1/fs/buffer.c
--- linux-4.1.16/fs/buffer.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/buffer.c 2016-01-28 22:15:57.132291817 +0300
@@ -3271,6 +3271,9 @@ SYSCALL_DEFINE2(bdflush, int, func, long
{
static int msg_count;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
diff -ruNp linux-4.1.16/fs/compat.c linux-4.1.16-cher1/fs/compat.c
--- linux-4.1.16/fs/compat.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/compat.c 2016-01-28 22:15:57.135291832 +0300
@@ -77,6 +77,11 @@ COMPAT_SYSCALL_DEFINE2(utime, const char
{
struct timespec tv[2];
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
if (t) {
if (get_user(tv[0].tv_sec, &t->actime) ||
get_user(tv[1].tv_sec, &t->modtime))
@@ -91,6 +96,11 @@ COMPAT_SYSCALL_DEFINE4(utimensat, unsign
{
struct timespec tv[2];
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
if (t) {
if (compat_get_timespec(&tv[0], &t[0]) ||
compat_get_timespec(&tv[1], &t[1]))
@@ -106,6 +116,11 @@ COMPAT_SYSCALL_DEFINE3(futimesat, unsign
{
struct timespec tv[2];
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
if (t) {
if (get_user(tv[0].tv_sec, &t[0].tv_sec) ||
get_user(tv[0].tv_nsec, &t[0].tv_usec) ||
@@ -159,12 +174,25 @@ static int cp_compat_stat(struct kstat *
return copy_to_user(ubuf, &tmp, sizeof(tmp)) ? -EFAULT : 0;
}
+int cher_patch_is_secure_path(const char*);
+
COMPAT_SYSCALL_DEFINE2(newstat, const char __user *, filename,
struct compat_stat __user *, statbuf)
{
struct kstat stat;
int error;
+ if (SBOX_IS_RESTRICTED()) {
+ struct filename *tmp = getname(filename);
+ if (IS_ERR(tmp)) return -EINVAL;
+ if (cher_patch_is_secure_path(tmp->name) < 0) {
+ putname(tmp);
+ return -EPERM;
+ }
+ if (!strncmp(tmp->name, "/SANDBOX/", 9)) filename += 9;
+ putname(tmp);
+ }
+
error = vfs_stat(filename, &stat);
if (error)
return error;
@@ -177,6 +205,17 @@ COMPAT_SYSCALL_DEFINE2(newlstat, const c
struct kstat stat;
int error;
+ if (SBOX_IS_RESTRICTED()) {
+ struct filename *tmp = getname(filename);
+ if (IS_ERR(tmp)) return -EINVAL;
+ if (cher_patch_is_secure_path(tmp->name) < 0) {
+ putname(tmp);
+ return -EPERM;
+ }
+ if (!strncmp(tmp->name, "/SANDBOX/", 9)) filename += 9;
+ putname(tmp);
+ }
+
error = vfs_lstat(filename, &stat);
if (error)
return error;
@@ -191,6 +230,9 @@ COMPAT_SYSCALL_DEFINE4(newfstatat, unsig
struct kstat stat;
int error;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
error = vfs_fstatat(dfd, filename, &stat, flag);
if (error)
return error;
@@ -250,7 +292,12 @@ static int put_compat_statfs(struct comp
COMPAT_SYSCALL_DEFINE2(statfs, const char __user *, pathname, struct compat_statfs __user *, buf)
{
struct kstatfs tmp;
- int error = user_statfs(pathname, &tmp);
+ int error;
+
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
+ error = user_statfs(pathname, &tmp);
if (!error)
error = put_compat_statfs(buf, &tmp);
return error;
@@ -259,7 +306,12 @@ COMPAT_SYSCALL_DEFINE2(statfs, const cha
COMPAT_SYSCALL_DEFINE2(fstatfs, unsigned int, fd, struct compat_statfs __user *, buf)
{
struct kstatfs tmp;
- int error = fd_statfs(fd, &tmp);
+ int error;
+
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
+ error = fd_statfs(fd, &tmp);
if (!error)
error = put_compat_statfs(buf, &tmp);
return error;
@@ -303,6 +355,9 @@ COMPAT_SYSCALL_DEFINE3(statfs64, const c
struct kstatfs tmp;
int error;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
if (sz != sizeof(*buf))
return -EINVAL;
@@ -317,6 +372,9 @@ COMPAT_SYSCALL_DEFINE3(fstatfs64, unsign
struct kstatfs tmp;
int error;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
if (sz != sizeof(*buf))
return -EINVAL;
@@ -335,7 +393,12 @@ COMPAT_SYSCALL_DEFINE2(ustat, unsigned,
{
struct compat_ustat tmp;
struct kstatfs sbuf;
- int err = vfs_ustat(new_decode_dev(dev), &sbuf);
+ int err;
+
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
+ err = vfs_ustat(new_decode_dev(dev), &sbuf);
if (err)
return err;
@@ -422,6 +485,9 @@ COMPAT_SYSCALL_DEFINE3(fcntl64, unsigned
long ret;
unsigned int conv_cmd;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
switch (cmd) {
case F_GETLK:
case F_SETLK:
@@ -506,6 +572,9 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigne
long ret;
aio_context_t ctx64;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
mm_segment_t oldfs = get_fs();
if (unlikely(get_user(ctx64, ctx32p)))
return -EFAULT;
@@ -529,6 +598,9 @@ COMPAT_SYSCALL_DEFINE5(io_getevents, com
struct timespec t;
struct timespec __user *ut = NULL;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
if (timeout) {
if (compat_get_timespec(&t, timeout))
return -EFAULT;
@@ -639,6 +711,9 @@ COMPAT_SYSCALL_DEFINE3(io_submit, compat
struct iocb __user * __user *iocb64;
long ret;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
if (unlikely(nr < 0))
return -EINVAL;
@@ -796,6 +871,11 @@ COMPAT_SYSCALL_DEFINE5(mount, const char
char *kernel_dev;
int retval;
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
kernel_type = copy_mount_string(type);
retval = PTR_ERR(kernel_type);
if (IS_ERR(kernel_type))
@@ -1098,6 +1178,10 @@ COMPAT_SYSCALL_DEFINE3(open, const char
*/
COMPAT_SYSCALL_DEFINE4(openat, int, dfd, const char __user *, filename, int, flags, umode_t, mode)
{
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
return do_sys_open(dfd, filename, flags, mode);
}
@@ -1476,6 +1560,11 @@ COMPAT_SYSCALL_DEFINE5(ppoll, struct pol
COMPAT_SYSCALL_DEFINE3(open_by_handle_at, int, mountdirfd,
struct file_handle __user *, handle, int, flags)
{
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
return do_handle_open(mountdirfd, handle, flags);
}
#endif
diff -ruNp linux-4.1.16/fs/compat_ioctl.c linux-4.1.16-cher1/fs/compat_ioctl.c
--- linux-4.1.16/fs/compat_ioctl.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/compat_ioctl.c 2016-01-28 22:15:57.136291837 +0300
@@ -1549,6 +1549,11 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned i
if (!f.file)
goto out;
+ if (SBOX_IS_RESTRICTED() && cmd != FIOCLEX && cmd != FIONCLEX) {
+ error = -EPERM;
+ goto out_fput;
+ }
+
/* RED-PEN how should LSM module know it's handling 32bit? */
error = security_file_ioctl(f.file, cmd, arg);
if (error)
diff -ruNp linux-4.1.16/fs/dcache.c linux-4.1.16-cher1/fs/dcache.c
--- linux-4.1.16/fs/dcache.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/dcache.c 2016-01-28 22:15:57.137291842 +0300
@@ -3249,8 +3249,14 @@ SYSCALL_DEFINE2(getcwd, char __user *, b
{
int error;
struct path pwd, root;
- char *page = __getname();
+ char *page = 0;
+ if (SBOX_IS_RESTRICTED()) {
+ copy_to_user(buf, "/SANDBOX", 9);
+ return 9;
+ }
+
+ page = __getname();
if (!page)
return -ENOMEM;
diff -ruNp linux-4.1.16/fs/dcookies.c linux-4.1.16-cher1/fs/dcookies.c
--- linux-4.1.16/fs/dcookies.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/dcookies.c 2016-01-28 22:15:57.137291842 +0300
@@ -155,6 +155,11 @@ SYSCALL_DEFINE3(lookup_dcookie, u64, coo
size_t pathlen;
struct dcookie_struct * dcs;
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
/* we could leak path information to users
* without dir read permission without this
*/
diff -ruNp linux-4.1.16/fs/eventfd.c linux-4.1.16-cher1/fs/eventfd.c
--- linux-4.1.16/fs/eventfd.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/eventfd.c 2016-01-28 22:15:57.138291848 +0300
@@ -422,6 +422,9 @@ SYSCALL_DEFINE2(eventfd2, unsigned int,
int fd, error;
struct file *file;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
error = get_unused_fd_flags(flags & EFD_SHARED_FCNTL_FLAGS);
if (error < 0)
return error;
diff -ruNp linux-4.1.16/fs/eventpoll.c linux-4.1.16-cher1/fs/eventpoll.c
--- linux-4.1.16/fs/eventpoll.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/eventpoll.c 2016-01-28 22:15:57.138291848 +0300
@@ -1767,6 +1767,9 @@ SYSCALL_DEFINE1(epoll_create1, int, flag
struct eventpoll *ep = NULL;
struct file *file;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
/* Check the EPOLL_* constant for consistency. */
BUILD_BUG_ON(EPOLL_CLOEXEC != O_CLOEXEC);
@@ -1828,6 +1831,9 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, in
struct epoll_event epds;
struct eventpoll *tep = NULL;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
error = -EFAULT;
if (ep_op_has_event(op) &&
copy_from_user(&epds, event, sizeof(struct epoll_event)))
@@ -1965,6 +1971,9 @@ SYSCALL_DEFINE4(epoll_wait, int, epfd, s
struct fd f;
struct eventpoll *ep;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
/* The maximum number of event must be greater than zero */
if (maxevents <= 0 || maxevents > EP_MAX_EVENTS)
return -EINVAL;
@@ -2011,6 +2020,9 @@ SYSCALL_DEFINE6(epoll_pwait, int, epfd,
int error;
sigset_t ksigmask, sigsaved;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
/*
* If the caller wants a certain signal mask to be set during the wait,
* we apply it here.
diff -ruNp linux-4.1.16/fs/exec.c linux-4.1.16-cher1/fs/exec.c
--- linux-4.1.16/fs/exec.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/exec.c 2016-01-28 22:15:57.139291853 +0300
@@ -121,6 +121,11 @@ SYSCALL_DEFINE1(uselib, const char __use
if (IS_ERR(tmp))
goto out;
+ if (SBOX_IS_RESTRICTED()) {
+ putname(tmp);
+ return -EPERM;
+ }
+
file = do_filp_open(AT_FDCWD, tmp, &uselib_flags);
putname(tmp);
error = PTR_ERR(file);
@@ -1486,6 +1491,15 @@ static int do_execveat_common(int fd, st
struct files_struct *displaced;
int retval;
+ if (SBOX_IS_RESTRICTED() && fd != AT_FDCWD) {
+ retval = -EPERM;
+ goto out_ret;
+ }
+ if ((current->sbox_flags & SBOX_NO_EXEC)) {
+ SBOX_SET_SECURITY_ERR();
+ goto out_ret;
+ }
+
if (IS_ERR(filename))
return PTR_ERR(filename);
@@ -1595,6 +1609,9 @@ static int do_execveat_common(int fd, st
putname(filename);
if (displaced)
put_files_struct(displaced);
+ if ((current->sbox_flags & SBOX_NO_SYSCALLS)) {
+ current->sbox_flags |= SBOX_NO_EXEC;
+ }
return retval;
out:
diff -ruNp linux-4.1.16/fs/fcntl.c linux-4.1.16-cher1/fs/fcntl.c
--- linux-4.1.16/fs/fcntl.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/fcntl.c 2016-01-28 22:15:57.140291858 +0300
@@ -361,6 +361,11 @@ SYSCALL_DEFINE3(fcntl, unsigned int, fd,
if (!f.file)
goto out;
+ if (SBOX_IS_RESTRICTED() && !check_fcntl_cmd(cmd)) {
+ err = -EPERM;
+ goto out1;
+ }
+
if (unlikely(f.file->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
goto out1;
@@ -386,6 +391,11 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f
if (!f.file)
goto out;
+ if (SBOX_IS_RESTRICTED() && !check_fcntl_cmd(cmd)) {
+ err = -EPERM;
+ goto out1;
+ }
+
if (unlikely(f.file->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
goto out1;
diff -ruNp linux-4.1.16/fs/fhandle.c linux-4.1.16-cher1/fs/fhandle.c
--- linux-4.1.16/fs/fhandle.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/fhandle.c 2016-01-28 22:15:57.140291858 +0300
@@ -97,6 +97,11 @@ SYSCALL_DEFINE5(name_to_handle_at, int,
int lookup_flags;
int err;
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
if ((flag & ~(AT_SYMLINK_FOLLOW | AT_EMPTY_PATH)) != 0)
return -EINVAL;
@@ -258,6 +263,11 @@ SYSCALL_DEFINE3(open_by_handle_at, int,
{
long ret;
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
if (force_o_largefile())
flags |= O_LARGEFILE;
diff -ruNp linux-4.1.16/fs/filesystems.c linux-4.1.16-cher1/fs/filesystems.c
--- linux-4.1.16/fs/filesystems.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/filesystems.c 2016-01-28 22:15:57.141291863 +0300
@@ -185,6 +185,11 @@ SYSCALL_DEFINE3(sysfs, int, option, unsi
{
int retval = -EINVAL;
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
switch (option) {
case 1:
retval = fs_index((const char __user *) arg1);
diff -ruNp linux-4.1.16/fs/ioctl.c linux-4.1.16-cher1/fs/ioctl.c
--- linux-4.1.16/fs/ioctl.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/ioctl.c 2016-01-28 22:15:57.141291863 +0300
@@ -617,6 +617,12 @@ SYSCALL_DEFINE3(ioctl, unsigned int, fd,
if (!f.file)
return -EBADF;
+
+ if (SBOX_IS_RESTRICTED() && cmd != FIOCLEX && cmd != FIONCLEX) {
+ fdput(f);
+ return -EPERM;
+ }
+
error = security_file_ioctl(f.file, cmd, arg);
if (!error)
error = do_vfs_ioctl(f.file, fd, cmd, arg);
diff -ruNp linux-4.1.16/fs/locks.c linux-4.1.16-cher1/fs/locks.c
--- linux-4.1.16/fs/locks.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/locks.c 2016-01-28 22:15:57.142291868 +0300
@@ -1904,6 +1904,11 @@ SYSCALL_DEFINE2(flock, unsigned int, fd,
if (!f.file)
goto out;
+ if (SBOX_IS_RESTRICTED()) {
+ fdput(f);
+ return -EPERM;
+ }
+
can_sleep = !(cmd & LOCK_NB);
cmd &= ~LOCK_NB;
unlock = (cmd == LOCK_UN);
diff -ruNp linux-4.1.16/fs/namei.c linux-4.1.16-cher1/fs/namei.c
--- linux-4.1.16/fs/namei.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/namei.c 2016-01-28 22:15:57.143291873 +0300
@@ -3510,6 +3510,11 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
int error;
unsigned int lookup_flags = 0;
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
error = may_mknod(mode);
if (error)
return error;
@@ -3582,6 +3587,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
int error;
unsigned int lookup_flags = LOOKUP_DIRECTORY;
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
retry:
dentry = user_path_create(dfd, pathname, &path, lookup_flags);
if (IS_ERR(dentry))
@@ -3728,6 +3738,9 @@ exit1:
SYSCALL_DEFINE1(rmdir, const char __user *, pathname)
{
+ if (SBOX_IS_RESTRICTED()) {
+ return -EPERM;
+ }
return do_rmdir(AT_FDCWD, pathname);
}
@@ -3868,6 +3881,10 @@ slashes:
SYSCALL_DEFINE3(unlinkat, int, dfd, const char __user *, pathname, int, flag)
{
+ if (SBOX_IS_RESTRICTED()) {
+ return -EPERM;
+ }
+
if ((flag & ~AT_REMOVEDIR) != 0)
return -EINVAL;
@@ -3879,6 +3896,10 @@ SYSCALL_DEFINE3(unlinkat, int, dfd, cons
SYSCALL_DEFINE1(unlink, const char __user *, pathname)
{
+ if (SBOX_IS_RESTRICTED()) {
+ return -EPERM;
+ }
+
return do_unlinkat(AT_FDCWD, pathname);
}
@@ -3912,6 +3933,10 @@ SYSCALL_DEFINE3(symlinkat, const char __
struct path path;
unsigned int lookup_flags = 0;
+ if (SBOX_IS_RESTRICTED()) {
+ return -EPERM;
+ }
+
from = getname(oldname);
if (IS_ERR(from))
return PTR_ERR(from);
@@ -4030,6 +4055,10 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
int how = 0;
int error;
+ if (SBOX_IS_RESTRICTED()) {
+ return -EPERM;
+ }
+
if ((flags & ~(AT_SYMLINK_FOLLOW | AT_EMPTY_PATH)) != 0)
return -EINVAL;
/*
@@ -4288,6 +4317,10 @@ SYSCALL_DEFINE5(renameat2, int, olddfd,
bool should_retry = false;
int error;
+ if (SBOX_IS_RESTRICTED()) {
+ return -EPERM;
+ }
+
if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT))
return -EINVAL;
diff -ruNp linux-4.1.16/fs/namespace.c linux-4.1.16-cher1/fs/namespace.c
--- linux-4.1.16/fs/namespace.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/namespace.c 2016-01-28 22:15:57.144291878 +0300
@@ -1588,6 +1588,11 @@ SYSCALL_DEFINE2(umount, char __user *, n
int retval;
int lookup_flags = 0;
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
if (flags & ~(MNT_FORCE | MNT_DETACH | MNT_EXPIRE | UMOUNT_NOFOLLOW))
return -EINVAL;
@@ -2887,6 +2892,11 @@ SYSCALL_DEFINE5(mount, char __user *, de
char *kernel_dev;
unsigned long data_page;
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
kernel_type = copy_mount_string(type);
ret = PTR_ERR(kernel_type);
if (IS_ERR(kernel_type))
@@ -2971,6 +2981,11 @@ SYSCALL_DEFINE2(pivot_root, const char _
struct mountpoint *old_mp, *root_mp;
int error;
+ if (SBOX_IS_RESTRICTED()) {
+ SBOX_SET_SECURITY_ERR();
+ return -EPERM;
+ }
+
if (!may_mount())
return -EPERM;
diff -ruNp linux-4.1.16/fs/notify/fanotify/fanotify_user.c linux-4.1.16-cher1/fs/notify/fanotify/fanotify_user.c
--- linux-4.1.16/fs/notify/fanotify/fanotify_user.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/notify/fanotify/fanotify_user.c 2016-01-28 22:15:57.144291878 +0300
@@ -694,6 +694,9 @@ SYSCALL_DEFINE2(fanotify_init, unsigned
struct user_struct *user;
struct fanotify_event_info *oevent;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
pr_debug("%s: flags=%d event_f_flags=%d\n",
__func__, flags, event_f_flags);
@@ -808,6 +811,9 @@ SYSCALL_DEFINE5(fanotify_mark, int, fano
struct path path;
int ret;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
pr_debug("%s: fanotify_fd=%d flags=%x dfd=%d pathname=%p mask=%llx\n",
__func__, fanotify_fd, flags, dfd, pathname, mask);
diff -ruNp linux-4.1.16/fs/notify/inotify/inotify_user.c linux-4.1.16-cher1/fs/notify/inotify/inotify_user.c
--- linux-4.1.16/fs/notify/inotify/inotify_user.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/notify/inotify/inotify_user.c 2016-01-28 22:15:57.144291878 +0300
@@ -671,6 +671,9 @@ SYSCALL_DEFINE1(inotify_init1, int, flag
struct fsnotify_group *group;
int ret;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
/* Check the IN_* constants for consistency. */
BUILD_BUG_ON(IN_CLOEXEC != O_CLOEXEC);
BUILD_BUG_ON(IN_NONBLOCK != O_NONBLOCK);
@@ -706,6 +709,9 @@ SYSCALL_DEFINE3(inotify_add_watch, int,
int ret;
unsigned flags = 0;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
/* don't allow invalid bits: we don't want flags set */
if (unlikely(!(mask & ALL_INOTIFY_BITS)))
return -EINVAL;
@@ -748,6 +754,9 @@ SYSCALL_DEFINE2(inotify_rm_watch, int, f
struct fd f;
int ret = 0;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
f = fdget(fd);
if (unlikely(!f.file))
return -EBADF;
diff -ruNp linux-4.1.16/fs/open.c linux-4.1.16-cher1/fs/open.c
--- linux-4.1.16/fs/open.c 2016-01-23 07:54:23.000000000 +0300
+++ linux-4.1.16-cher1/fs/open.c 2016-01-28 22:15:57.148291899 +0300
@@ -34,6 +34,54 @@
#include "internal.h"
+static const char * const secure_paths[] =
+{
+ "/lib/", "/lib32/", "/lib64/",
+ "/usr/lib/", "/usr/lib32/", "/usr/lib64/",
+ "/usr/include/", "/usr/libexec/",
+ "/usr/local/lib/", "/usr/local/lib32/", "/usr/local/lib64/",
+ "/usr/local/include/", "/usr/local/libexec/",
+ "/bin/", "/usr/bin/", "/usr/local/bin/",
+ "/usr/share/", "/usr/local/share/", "/dev/urandom", "/dev/zero", "/dev/null",
+ "/SANDBOX/",
+ NULL
+};
+
+int cher_patch_is_secure_path(const char *path)
+{
+ const char *s;
+ int i;
+
+ if (strstr(path, ".."))
+ return -1;
+ for (i = 0; secure_paths[i] && strncmp(path, secure_paths[i], strlen(secure_paths[i])); ++i);
+ if (secure_paths[i]) {
+ return 0;
+ }
+
+ if (!strncmp(path, "/SANDBOX/", 9)) path += 9;
+ s = path;
+ while (s[0] == '.' && s[1] == '/') s += 2;
+ for (; *s && *s != '/'; s++);
+ if (*s == '/') return -1;
+ return 0;
+}
+
+int cher_check_user_path(int dfd, const char __user **p_path)
+{
+ struct filename *tmp = NULL;
+ if (dfd != AT_FDCWD) return -EPERM;
+ tmp = getname(*p_path);
+ if (IS_ERR(tmp)) return -EINVAL;
+ if (cher_patch_is_secure_path(tmp->name) < 0) {
+ putname(tmp);
+ return -EPERM;
+ }
+ if (!strncmp("/SANDBOX/", tmp->name, 9)) *p_path += 9;
+ putname(tmp);
+ return 0;
+}
+
int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
struct file *filp)
{
@@ -139,12 +187,18 @@ retry:
SYSCALL_DEFINE2(truncate, const char __user *, path, long, length)
{
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
return do_sys_truncate(path, length);
}
#ifdef CONFIG_COMPAT
COMPAT_SYSCALL_DEFINE2(truncate, const char __user *, path, compat_off_t, length)
{
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
return do_sys_truncate(path, length);
}
#endif
@@ -212,11 +266,17 @@ COMPAT_SYSCALL_DEFINE2(ftruncate, unsign
#if BITS_PER_LONG == 32
SYSCALL_DEFINE2(truncate64, const char __user *, path, loff_t, length)
{
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
return do_sys_truncate(path, length);
}
SYSCALL_DEFINE2(ftruncate64, unsigned int, fd, loff_t, length)
{
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
return do_sys_ftruncate(fd, length, 0);
}
#endif /* BITS_PER_LONG == 32 */
@@ -317,9 +377,13 @@ EXPORT_SYMBOL_GPL(vfs_fallocate);
SYSCALL_DEFINE4(fallocate, int, fd, int, mode, loff_t, offset, loff_t, len)
{
- struct fd f = fdget(fd);
+ struct fd f;
int error = -EBADF;
+ if (SBOX_IS_RESTRICTED())
+ return -EPERM;
+
+ f = fdget(fd);
if (f.file) {
error = vfs_fallocate(f.file, mode, offset, len);
fdput(f);
@@ -341,6 +405,11 @@ SYSCALL_DEFINE3(faccessat, int, dfd, con
int res;
unsigned int lookup_flags = LOOKUP_FOLLOW;
+ if (SBOX_IS_RESTRICTED()) {
+ res = cher_check_user_path(dfd, &filename);
+ if (res < 0) return res;
+ }
+
if (mode & ~S_IRWXO) /* where's F_OK, X_OK, W_OK, R_OK? */
return -EINVAL;
@@ -418,6 +487,10 @@ SYSCALL_DEFINE1(chdir, const char __user
struct path path;
int error;