April 2024 - Kernel - mailweb.openeuler.org

[openeuler:openEuler-1.0-LTS 22104/22139] fs/proc/array.c:614:9: warning: 'gtime' may be used uninitialized
by kernel test robot 19 Apr '24

19 Apr '24

tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: cc163ca2127ce6ebda08bc76d555cdabfb19ef65 commit: 4f8730514c736b09927b1b9c08ad946b70639545 [22104/22139] fs/proc: do_task_stat: use sig->stats_lock to gather the threads/children stats config: x86_64-buildonly-randconfig-005-20240418 (https://download.01.org/0day-ci/archive/20240419/202404190005.E7Ruoi45-lkp@…) compiler: gcc-12 (Ubuntu 12.3.0-9ubuntu2) 12.3.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240419/202404190005.E7Ruoi45-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202404190005.E7Ruoi45-lkp@intel.com/ Note: it may well be a FALSE warning. FWIW you are at least aware of it now. http://gcc.gnu.org/wiki/Better_Uninitialized_Warnings All warnings (new ones prefixed by >>): In file included from include/linux/sched/signal.h:7, from include/linux/sched/cputime.h:5, from fs/proc/array.c:68: include/linux/signal.h: In function 'sigemptyset': include/linux/signal.h:180:29: warning: this statement may fall through [-Wimplicit-fallthrough=] 180 | case 2: set->sig[1] = 0; | ~~~~~~~~~~~~^~~ include/linux/signal.h:181:9: note: here 181 | case 1: set->sig[0] = 0; | ^~~~ fs/proc/array.c: In function 'do_task_stat': >> fs/proc/array.c:614:9: warning: 'gtime' may be used uninitialized [-Wmaybe-uninitialized] 614 | seq_put_decimal_ull(m, " ", nsec_to_clock_t(gtime)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ fs/proc/array.c:447:51: note: 'gtime' was declared here 447 | u64 cutime, cstime, cgtime, utime, stime, gtime; | ^~~~~ >> fs/proc/array.c:567:9: warning: 'maj_flt' may be used uninitialized [-Wmaybe-uninitialized] 567 | seq_put_decimal_ull(m, " ", maj_flt); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ fs/proc/array.c:446:52: note: 'maj_flt' was declared here 446 | unsigned long cmin_flt, cmaj_flt, min_flt, maj_flt; | ^~~~~~~ >> fs/proc/array.c:565:9: warning: 'min_flt' may be used uninitialized [-Wmaybe-uninitialized] 565 | seq_put_decimal_ull(m, " ", min_flt); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ fs/proc/array.c:446:43: note: 'min_flt' was declared here 446 | unsigned long cmin_flt, cmaj_flt, min_flt, maj_flt; | ^~~~~~~ vim +/gtime +614 fs/proc/array.c ^1da177e4c3f41 Linus Torvalds 2005-04-16 432 ee992744ea53db Eric W. Biederman 2008-02-08 433 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, ee992744ea53db Eric W. Biederman 2008-02-08 434 struct pid *pid, struct task_struct *task, int whole) ^1da177e4c3f41 Linus Torvalds 2005-04-16 435 { b2f73922d11968 Ingo Molnar 2015-09-30 436 unsigned long vsize, eip, esp, wchan = 0; 715be1fce0d964 Jan Engelhardt 2012-05-31 437 int priority, nice; ^1da177e4c3f41 Linus Torvalds 2005-04-16 438 int tty_pgrp = -1, tty_nr = 0; ^1da177e4c3f41 Linus Torvalds 2005-04-16 439 sigset_t sigign, sigcatch; ^1da177e4c3f41 Linus Torvalds 2005-04-16 440 char state; a593d6edeb0a5a Oleg Nesterov 2006-10-02 441 pid_t ppid = 0, pgid = -1, sid = -1; ^1da177e4c3f41 Linus Torvalds 2005-04-16 442 int num_threads = 0; f83ce3e6b02d5e Jake Edge 2009-05-04 443 int permitted; ^1da177e4c3f41 Linus Torvalds 2005-04-16 444 struct mm_struct *mm; ^1da177e4c3f41 Linus Torvalds 2005-04-16 445 unsigned long long start_time; 4f8730514c736b Oleg Nesterov 2024-04-13 446 unsigned long cmin_flt, cmaj_flt, min_flt, maj_flt; 4f8730514c736b Oleg Nesterov 2024-04-13 447 u64 cutime, cstime, cgtime, utime, stime, gtime; ^1da177e4c3f41 Linus Torvalds 2005-04-16 448 unsigned long rsslim = 0; a593d6edeb0a5a Oleg Nesterov 2006-10-02 449 unsigned long flags; 08132d3d089b9a Eric W. Biederman 2024-04-13 450 int exit_code = task->exit_code; 4f8730514c736b Oleg Nesterov 2024-04-13 451 struct signal_struct *sig = task->signal; 4f8730514c736b Oleg Nesterov 2024-04-13 452 unsigned int seq = 1; ^1da177e4c3f41 Linus Torvalds 2005-04-16 453 ^1da177e4c3f41 Linus Torvalds 2005-04-16 454 state = *get_task_state(task); ^1da177e4c3f41 Linus Torvalds 2005-04-16 455 vsize = eip = esp = 0; caaee6234d05a5 Jann Horn 2016-01-20 456 permitted = ptrace_may_access(task, PTRACE_MODE_READ_FSCREDS | PTRACE_MODE_NOAUDIT); ^1da177e4c3f41 Linus Torvalds 2005-04-16 457 mm = get_task_mm(task); ^1da177e4c3f41 Linus Torvalds 2005-04-16 458 if (mm) { ^1da177e4c3f41 Linus Torvalds 2005-04-16 459 vsize = task_vsize(mm); 0a1eb2d474edfe Andy Lutomirski 2016-09-30 460 /* 0a1eb2d474edfe Andy Lutomirski 2016-09-30 461 * esp and eip are intentionally zeroed out. There is no 0a1eb2d474edfe Andy Lutomirski 2016-09-30 462 * non-racy way to read them without freezing the task. 0a1eb2d474edfe Andy Lutomirski 2016-09-30 463 * Programs that need reliable values can use ptrace(2). fd7d56270b526c John Ogness 2017-09-14 464 * fd7d56270b526c John Ogness 2017-09-14 465 * The only exception is if the task is core dumping because fd7d56270b526c John Ogness 2017-09-14 466 * a program is not able to use ptrace(2) in that case. It is fd7d56270b526c John Ogness 2017-09-14 467 * safe because the task has stopped executing permanently. 0a1eb2d474edfe Andy Lutomirski 2016-09-30 468 */ ef7622dbb87776 John Ogness 2019-07-04 469 if (permitted && (task->flags & (PF_EXITING|PF_DUMPCORE))) { 8bb2ee192e482c Alexey Dobriyan 2018-01-18 470 if (try_get_task_stack(task)) { fd7d56270b526c John Ogness 2017-09-14 471 eip = KSTK_EIP(task); fd7d56270b526c John Ogness 2017-09-14 472 esp = KSTK_ESP(task); 8bb2ee192e482c Alexey Dobriyan 2018-01-18 473 put_task_stack(task); 8bb2ee192e482c Alexey Dobriyan 2018-01-18 474 } fd7d56270b526c John Ogness 2017-09-14 475 } f83ce3e6b02d5e Jake Edge 2009-05-04 476 } ^1da177e4c3f41 Linus Torvalds 2005-04-16 477 ^1da177e4c3f41 Linus Torvalds 2005-04-16 478 sigemptyset(&sigign); ^1da177e4c3f41 Linus Torvalds 2005-04-16 479 sigemptyset(&sigcatch); 3cfd0885fac78c Alan Cox 2006-09-29 480 a593d6edeb0a5a Oleg Nesterov 2006-10-02 481 if (lock_task_sighand(task, &flags)) { 915935041281c6 Oleg Nesterov 2006-12-08 482 if (sig->tty) { 5d0fdf1e018998 Alan Cox 2008-04-30 483 struct pid *pgrp = tty_get_pgrp(sig->tty); 5d0fdf1e018998 Alan Cox 2008-04-30 484 tty_pgrp = pid_nr_ns(pgrp, ns); 5d0fdf1e018998 Alan Cox 2008-04-30 485 put_pid(pgrp); 915935041281c6 Oleg Nesterov 2006-12-08 486 tty_nr = new_encode_dev(tty_devnum(sig->tty)); a593d6edeb0a5a Oleg Nesterov 2006-10-02 487 } a593d6edeb0a5a Oleg Nesterov 2006-10-02 488 7e49827cc937a7 Oleg Nesterov 2010-05-26 489 num_threads = get_nr_threads(task); ^1da177e4c3f41 Linus Torvalds 2005-04-16 490 collect_sigign_sigcatch(task, &sigign, &sigcatch); ^1da177e4c3f41 Linus Torvalds 2005-04-16 491 6aa7de059173a9 Mark Rutland 2017-10-23 492 rsslim = READ_ONCE(sig->rlim[RLIMIT_RSS].rlim_cur); a593d6edeb0a5a Oleg Nesterov 2006-10-02 493 ^1da177e4c3f41 Linus Torvalds 2005-04-16 494 if (whole) { 08132d3d089b9a Eric W. Biederman 2024-04-13 495 if (sig->flags & (SIGNAL_GROUP_EXIT | SIGNAL_STOP_STOPPED)) 08132d3d089b9a Eric W. Biederman 2024-04-13 496 exit_code = sig->group_exit_code; ^1da177e4c3f41 Linus Torvalds 2005-04-16 497 } a593d6edeb0a5a Oleg Nesterov 2006-10-02 498 b488893a390edf Pavel Emelyanov 2007-10-18 499 sid = task_session_nr_ns(task, ns); a98fdcef941e10 Oleg Nesterov 2008-01-15 500 ppid = task_tgid_nr_ns(task->real_parent, ns); b488893a390edf Pavel Emelyanov 2007-10-18 501 pgid = task_pgrp_nr_ns(task, ns); a593d6edeb0a5a Oleg Nesterov 2006-10-02 502 a593d6edeb0a5a Oleg Nesterov 2006-10-02 503 unlock_task_sighand(task, &flags); ^1da177e4c3f41 Linus Torvalds 2005-04-16 504 } ^1da177e4c3f41 Linus Torvalds 2005-04-16 505 f83ce3e6b02d5e Jake Edge 2009-05-04 506 if (permitted && (!whole || num_threads < 2)) ^1da177e4c3f41 Linus Torvalds 2005-04-16 507 wchan = get_wchan(task); f59c1abf66d159 Oleg Nesterov 2024-04-13 508 4f8730514c736b Oleg Nesterov 2024-04-13 509 do { 4f8730514c736b Oleg Nesterov 2024-04-13 510 seq++; /* 2 on the 1st/lockless path, otherwise odd */ 4f8730514c736b Oleg Nesterov 2024-04-13 511 flags = read_seqbegin_or_lock_irqsave(&sig->stats_lock, &seq); 4f8730514c736b Oleg Nesterov 2024-04-13 512 4f8730514c736b Oleg Nesterov 2024-04-13 513 cmin_flt = sig->cmin_flt; 4f8730514c736b Oleg Nesterov 2024-04-13 514 cmaj_flt = sig->cmaj_flt; 4f8730514c736b Oleg Nesterov 2024-04-13 515 cutime = sig->cutime; 4f8730514c736b Oleg Nesterov 2024-04-13 516 cstime = sig->cstime; 4f8730514c736b Oleg Nesterov 2024-04-13 517 cgtime = sig->cgtime; 4f8730514c736b Oleg Nesterov 2024-04-13 518 4f8730514c736b Oleg Nesterov 2024-04-13 519 if (whole) { 4f8730514c736b Oleg Nesterov 2024-04-13 520 struct task_struct *t; 4f8730514c736b Oleg Nesterov 2024-04-13 521 4f8730514c736b Oleg Nesterov 2024-04-13 522 min_flt = sig->min_flt; 4f8730514c736b Oleg Nesterov 2024-04-13 523 maj_flt = sig->maj_flt; 4f8730514c736b Oleg Nesterov 2024-04-13 524 gtime = sig->gtime; 4f8730514c736b Oleg Nesterov 2024-04-13 525 4f8730514c736b Oleg Nesterov 2024-04-13 526 rcu_read_lock(); 4f8730514c736b Oleg Nesterov 2024-04-13 527 __for_each_thread(sig, t) { 4f8730514c736b Oleg Nesterov 2024-04-13 528 min_flt += t->min_flt; 4f8730514c736b Oleg Nesterov 2024-04-13 529 maj_flt += t->maj_flt; 4f8730514c736b Oleg Nesterov 2024-04-13 530 gtime += task_gtime(t); 4f8730514c736b Oleg Nesterov 2024-04-13 531 } 4f8730514c736b Oleg Nesterov 2024-04-13 532 rcu_read_unlock(); 4f8730514c736b Oleg Nesterov 2024-04-13 533 } 4f8730514c736b Oleg Nesterov 2024-04-13 534 } while (need_seqretry(&sig->stats_lock, seq)); 4f8730514c736b Oleg Nesterov 2024-04-13 535 done_seqretry_irqrestore(&sig->stats_lock, seq, flags); 4f8730514c736b Oleg Nesterov 2024-04-13 536 f59c1abf66d159 Oleg Nesterov 2024-04-13 537 if (whole) { f59c1abf66d159 Oleg Nesterov 2024-04-13 538 thread_group_cputime_adjusted(task, &utime, &stime); f59c1abf66d159 Oleg Nesterov 2024-04-13 539 } else { f59c1abf66d159 Oleg Nesterov 2024-04-13 540 task_cputime_adjusted(task, &utime, &stime); ^1da177e4c3f41 Linus Torvalds 2005-04-16 541 min_flt = task->min_flt; ^1da177e4c3f41 Linus Torvalds 2005-04-16 542 maj_flt = task->maj_flt; 6fac4829ce0ef9 Frederic Weisbecker 2012-11-13 543 gtime = task_gtime(task); ^1da177e4c3f41 Linus Torvalds 2005-04-16 544 } ^1da177e4c3f41 Linus Torvalds 2005-04-16 545 ^1da177e4c3f41 Linus Torvalds 2005-04-16 546 /* scale priority and nice values from timeslices to -20..20 */ ^1da177e4c3f41 Linus Torvalds 2005-04-16 547 /* to make it look like a "normal" Unix priority/nice value */ ^1da177e4c3f41 Linus Torvalds 2005-04-16 548 priority = task_prio(task); ^1da177e4c3f41 Linus Torvalds 2005-04-16 549 nice = task_nice(task); ^1da177e4c3f41 Linus Torvalds 2005-04-16 550 ^1da177e4c3f41 Linus Torvalds 2005-04-16 551 /* convert nsec -> ticks */ 57e0be041d9e21 Thomas Gleixner 2014-07-16 552 start_time = nsec_to_clock_t(task->real_start_time); ^1da177e4c3f41 Linus Torvalds 2005-04-16 553 d0f02231222b31 Andrei Vagin 2018-04-10 554 seq_put_decimal_ull(m, "", pid_nr_ns(pid, ns)); d0f02231222b31 Andrei Vagin 2018-04-10 555 seq_puts(m, " ("); 88b72b31e15f9d Tejun Heo 2018-05-18 556 proc_task_name(m, task, false); d0f02231222b31 Andrei Vagin 2018-04-10 557 seq_puts(m, ") "); d0f02231222b31 Andrei Vagin 2018-04-10 558 seq_putc(m, state); 75ba1d07fd6a49 Joe Perches 2016-10-07 559 seq_put_decimal_ll(m, " ", ppid); 75ba1d07fd6a49 Joe Perches 2016-10-07 560 seq_put_decimal_ll(m, " ", pgid); 75ba1d07fd6a49 Joe Perches 2016-10-07 561 seq_put_decimal_ll(m, " ", sid); 75ba1d07fd6a49 Joe Perches 2016-10-07 562 seq_put_decimal_ll(m, " ", tty_nr); 75ba1d07fd6a49 Joe Perches 2016-10-07 563 seq_put_decimal_ll(m, " ", tty_pgrp); 75ba1d07fd6a49 Joe Perches 2016-10-07 564 seq_put_decimal_ull(m, " ", task->flags); 75ba1d07fd6a49 Joe Perches 2016-10-07 @565 seq_put_decimal_ull(m, " ", min_flt); 75ba1d07fd6a49 Joe Perches 2016-10-07 566 seq_put_decimal_ull(m, " ", cmin_flt); 75ba1d07fd6a49 Joe Perches 2016-10-07 @567 seq_put_decimal_ull(m, " ", maj_flt); 75ba1d07fd6a49 Joe Perches 2016-10-07 568 seq_put_decimal_ull(m, " ", cmaj_flt); 5613fda9a503cd Frederic Weisbecker 2017-01-31 569 seq_put_decimal_ull(m, " ", nsec_to_clock_t(utime)); 5613fda9a503cd Frederic Weisbecker 2017-01-31 570 seq_put_decimal_ull(m, " ", nsec_to_clock_t(stime)); 5613fda9a503cd Frederic Weisbecker 2017-01-31 571 seq_put_decimal_ll(m, " ", nsec_to_clock_t(cutime)); 5613fda9a503cd Frederic Weisbecker 2017-01-31 572 seq_put_decimal_ll(m, " ", nsec_to_clock_t(cstime)); 75ba1d07fd6a49 Joe Perches 2016-10-07 573 seq_put_decimal_ll(m, " ", priority); 75ba1d07fd6a49 Joe Perches 2016-10-07 574 seq_put_decimal_ll(m, " ", nice); 75ba1d07fd6a49 Joe Perches 2016-10-07 575 seq_put_decimal_ll(m, " ", num_threads); 75ba1d07fd6a49 Joe Perches 2016-10-07 576 seq_put_decimal_ull(m, " ", 0); 75ba1d07fd6a49 Joe Perches 2016-10-07 577 seq_put_decimal_ull(m, " ", start_time); 75ba1d07fd6a49 Joe Perches 2016-10-07 578 seq_put_decimal_ull(m, " ", vsize); 75ba1d07fd6a49 Joe Perches 2016-10-07 579 seq_put_decimal_ull(m, " ", mm ? get_mm_rss(mm) : 0); 75ba1d07fd6a49 Joe Perches 2016-10-07 580 seq_put_decimal_ull(m, " ", rsslim); 75ba1d07fd6a49 Joe Perches 2016-10-07 581 seq_put_decimal_ull(m, " ", mm ? (permitted ? mm->start_code : 1) : 0); 75ba1d07fd6a49 Joe Perches 2016-10-07 582 seq_put_decimal_ull(m, " ", mm ? (permitted ? mm->end_code : 1) : 0); 75ba1d07fd6a49 Joe Perches 2016-10-07 583 seq_put_decimal_ull(m, " ", (permitted && mm) ? mm->start_stack : 0); 75ba1d07fd6a49 Joe Perches 2016-10-07 584 seq_put_decimal_ull(m, " ", esp); 75ba1d07fd6a49 Joe Perches 2016-10-07 585 seq_put_decimal_ull(m, " ", eip); ^1da177e4c3f41 Linus Torvalds 2005-04-16 586 /* The signal information here is obsolete. ^1da177e4c3f41 Linus Torvalds 2005-04-16 587 * It must be decimal for Linux 2.0 compatibility. ^1da177e4c3f41 Linus Torvalds 2005-04-16 588 * Use /proc/#/status for real-time signals. ^1da177e4c3f41 Linus Torvalds 2005-04-16 589 */ 75ba1d07fd6a49 Joe Perches 2016-10-07 590 seq_put_decimal_ull(m, " ", task->pending.signal.sig[0] & 0x7fffffffUL); 75ba1d07fd6a49 Joe Perches 2016-10-07 591 seq_put_decimal_ull(m, " ", task->blocked.sig[0] & 0x7fffffffUL); 75ba1d07fd6a49 Joe Perches 2016-10-07 592 seq_put_decimal_ull(m, " ", sigign.sig[0] & 0x7fffffffUL); 75ba1d07fd6a49 Joe Perches 2016-10-07 593 seq_put_decimal_ull(m, " ", sigcatch.sig[0] & 0x7fffffffUL); b2f73922d11968 Ingo Molnar 2015-09-30 594 b2f73922d11968 Ingo Molnar 2015-09-30 595 /* b2f73922d11968 Ingo Molnar 2015-09-30 596 * We used to output the absolute kernel address, but that's an b2f73922d11968 Ingo Molnar 2015-09-30 597 * information leak - so instead we show a 0/1 flag here, to signal b2f73922d11968 Ingo Molnar 2015-09-30 598 * to user-space whether there's a wchan field in /proc/PID/wchan. b2f73922d11968 Ingo Molnar 2015-09-30 599 * b2f73922d11968 Ingo Molnar 2015-09-30 600 * This works with older implementations of procps as well. b2f73922d11968 Ingo Molnar 2015-09-30 601 */ b2f73922d11968 Ingo Molnar 2015-09-30 602 if (wchan) b2f73922d11968 Ingo Molnar 2015-09-30 603 seq_puts(m, " 1"); b2f73922d11968 Ingo Molnar 2015-09-30 604 else b2f73922d11968 Ingo Molnar 2015-09-30 605 seq_puts(m, " 0"); b2f73922d11968 Ingo Molnar 2015-09-30 606 75ba1d07fd6a49 Joe Perches 2016-10-07 607 seq_put_decimal_ull(m, " ", 0); 75ba1d07fd6a49 Joe Perches 2016-10-07 608 seq_put_decimal_ull(m, " ", 0); 75ba1d07fd6a49 Joe Perches 2016-10-07 609 seq_put_decimal_ll(m, " ", task->exit_signal); 75ba1d07fd6a49 Joe Perches 2016-10-07 610 seq_put_decimal_ll(m, " ", task_cpu(task)); 75ba1d07fd6a49 Joe Perches 2016-10-07 611 seq_put_decimal_ull(m, " ", task->rt_priority); 75ba1d07fd6a49 Joe Perches 2016-10-07 612 seq_put_decimal_ull(m, " ", task->policy); 75ba1d07fd6a49 Joe Perches 2016-10-07 613 seq_put_decimal_ull(m, " ", delayacct_blkio_ticks(task)); 16a6d9be90373f Frederic Weisbecker 2017-01-31 @614 seq_put_decimal_ull(m, " ", nsec_to_clock_t(gtime)); 16a6d9be90373f Frederic Weisbecker 2017-01-31 615 seq_put_decimal_ll(m, " ", nsec_to_clock_t(cgtime)); 5b172087f99189 Cyrill Gorcunov 2012-05-31 616 5b172087f99189 Cyrill Gorcunov 2012-05-31 617 if (mm && permitted) { 75ba1d07fd6a49 Joe Perches 2016-10-07 618 seq_put_decimal_ull(m, " ", mm->start_data); 75ba1d07fd6a49 Joe Perches 2016-10-07 619 seq_put_decimal_ull(m, " ", mm->end_data); 75ba1d07fd6a49 Joe Perches 2016-10-07 620 seq_put_decimal_ull(m, " ", mm->start_brk); 75ba1d07fd6a49 Joe Perches 2016-10-07 621 seq_put_decimal_ull(m, " ", mm->arg_start); 75ba1d07fd6a49 Joe Perches 2016-10-07 622 seq_put_decimal_ull(m, " ", mm->arg_end); 75ba1d07fd6a49 Joe Perches 2016-10-07 623 seq_put_decimal_ull(m, " ", mm->env_start); 75ba1d07fd6a49 Joe Perches 2016-10-07 624 seq_put_decimal_ull(m, " ", mm->env_end); 5b172087f99189 Cyrill Gorcunov 2012-05-31 625 } else 75ba1d07fd6a49 Joe Perches 2016-10-07 626 seq_puts(m, " 0 0 0 0 0 0 0"); 5b172087f99189 Cyrill Gorcunov 2012-05-31 627 5b172087f99189 Cyrill Gorcunov 2012-05-31 628 if (permitted) 08132d3d089b9a Eric W. Biederman 2024-04-13 629 seq_put_decimal_ll(m, " ", exit_code); 5b172087f99189 Cyrill Gorcunov 2012-05-31 630 else 75ba1d07fd6a49 Joe Perches 2016-10-07 631 seq_puts(m, " 0"); 5b172087f99189 Cyrill Gorcunov 2012-05-31 632 bda7bad62bc4c4 KAMEZAWA Hiroyuki 2012-03-23 633 seq_putc(m, '\n'); ^1da177e4c3f41 Linus Torvalds 2005-04-16 634 if (mm) ^1da177e4c3f41 Linus Torvalds 2005-04-16 635 mmput(mm); ee992744ea53db Eric W. Biederman 2008-02-08 636 return 0; ^1da177e4c3f41 Linus Torvalds 2005-04-16 637 } ^1da177e4c3f41 Linus Torvalds 2005-04-16 638 :::::: The code at line 614 was first introduced by commit :::::: 16a6d9be90373fb0b521850cd0185a4d460dd152 sched/cputime: Convert guest time accounting to nsecs (u64) :::::: TO: Frederic Weisbecker <fweisbec(a)gmail.com> :::::: CC: Ingo Molnar <mingo(a)kernel.org> -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH openEuler-1.0-LTS] tipc: Check the bearer type before calling tipc_udp_nl_bearer_add()
by Wang Hai 18 Apr '24

18 Apr '24

From: Shigeru Yoshida <syoshida(a)redhat.com> stable inclusion from stable-v4.19.307 commit 24ec8f0da93b8a9fba11600be8a90f0d73fb46f1 category: bugfix bugzilla: 189794 CVE: CVE-2024-26663 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- [ Upstream commit 3871aa01e1a779d866fa9dfdd5a836f342f4eb87 ] syzbot reported the following general protection fault [1]: general protection fault, probably for non-canonical address 0xdffffc0000000010: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x0000000000000080-0x0000000000000087] ... RIP: 0010:tipc_udp_is_known_peer+0x9c/0x250 net/tipc/udp_media.c:291 ... Call Trace: <TASK> tipc_udp_nl_bearer_add+0x212/0x2f0 net/tipc/udp_media.c:646 tipc_nl_bearer_add+0x21e/0x360 net/tipc/bearer.c:1089 genl_family_rcv_msg_doit+0x1fc/0x2e0 net/netlink/genetlink.c:972 genl_family_rcv_msg net/netlink/genetlink.c:1052 [inline] genl_rcv_msg+0x561/0x800 net/netlink/genetlink.c:1067 netlink_rcv_skb+0x16b/0x440 net/netlink/af_netlink.c:2544 genl_rcv+0x28/0x40 net/netlink/genetlink.c:1076 netlink_unicast_kernel net/netlink/af_netlink.c:1341 [inline] netlink_unicast+0x53b/0x810 net/netlink/af_netlink.c:1367 netlink_sendmsg+0x8b7/0xd70 net/netlink/af_netlink.c:1909 sock_sendmsg_nosec net/socket.c:730 [inline] __sock_sendmsg+0xd5/0x180 net/socket.c:745 ____sys_sendmsg+0x6ac/0x940 net/socket.c:2584 ___sys_sendmsg+0x135/0x1d0 net/socket.c:2638 __sys_sendmsg+0x117/0x1e0 net/socket.c:2667 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x40/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x63/0x6b The cause of this issue is that when tipc_nl_bearer_add() is called with the TIPC_NLA_BEARER_UDP_OPTS attribute, tipc_udp_nl_bearer_add() is called even if the bearer is not UDP. tipc_udp_is_known_peer() called by tipc_udp_nl_bearer_add() assumes that the media_ptr field of the tipc_bearer has an udp_bearer type object, so the function goes crazy for non-UDP bearers. This patch fixes the issue by checking the bearer type before calling tipc_udp_nl_bearer_add() in tipc_nl_bearer_add(). Fixes: ef20cd4dd163 ("tipc: introduce UDP replicast") Reported-and-tested-by: syzbot+5142b87a9abc510e14fa(a)syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=5142b87a9abc510e14fa [1] Signed-off-by: Shigeru Yoshida <syoshida(a)redhat.com> Reviewed-by: Tung Nguyen <tung.q.nguyen(a)dektech.com.au> Link: https://lore.kernel.org/r/20240131152310.4089541-1-syoshida@redhat.com Signed-off-by: Paolo Abeni <pabeni(a)redhat.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Wang Hai <wanghai38(a)huawei.com> --- net/tipc/bearer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index 2649a0a0d45e..6f808402bb21 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c @@ -937,6 +937,12 @@ int tipc_nl_bearer_add(struct sk_buff *skb, struct genl_info *info) #ifdef CONFIG_TIPC_MEDIA_UDP if (attrs[TIPC_NLA_BEARER_UDP_OPTS]) { + if (b->media->type_id != TIPC_MEDIA_TYPE_UDP) { + rtnl_unlock(); + NL_SET_ERR_MSG(info->extack, "UDP option is unsupported"); + return -EINVAL; + } + err = tipc_udp_nl_bearer_add(b, attrs[TIPC_NLA_BEARER_UDP_OPTS]); if (err) { -- 2.17.1

2 1

[PATCH OLK-5.10] net/mlx5e: CT, Fix multiple allocations and memleak of mod acts
by Zeng Heng 18 Apr '24

18 Apr '24

From: Roi Dayan <roid(a)nvidia.com> mainline inclusion from mainline-v5.16-rc2 commit 806401c20a0f9c51b6c8fd7035671e6ca841f6c2 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9FNFU CVE: CVE-2021-47199 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- CT clear action offload adds additional mod hdr actions to the flow's original mod actions in order to clear the registers which hold ct_state. When such flow also includes encap action, a neigh update event can cause the driver to unoffload the flow and then reoffload it. Each time this happens, the ct clear handling adds that same set of mod hdr actions to reset ct_state until the max of mod hdr actions is reached. Also the driver never releases the allocated mod hdr actions and causing a memleak. Fix above two issues by moving CT clear mod acts allocation into the parsing actions phase and only use it when offloading the rule. The release of mod acts will be done in the normal flow_put(). backtrace: [<000000007316e2f3>] krealloc+0x83/0xd0 [<00000000ef157de1>] mlx5e_mod_hdr_alloc+0x147/0x300 [mlx5_core] [<00000000970ce4ae>] mlx5e_tc_match_to_reg_set_and_get_id+0xd7/0x240 [mlx5_core] [<0000000067c5fa17>] mlx5e_tc_match_to_reg_set+0xa/0x20 [mlx5_core] [<00000000d032eb98>] mlx5_tc_ct_entry_set_registers.isra.0+0x36/0xc0 [mlx5_core] [<00000000fd23b869>] mlx5_tc_ct_flow_offload+0x272/0x1f10 [mlx5_core] [<000000004fc24acc>] mlx5e_tc_offload_fdb_rules.part.0+0x150/0x620 [mlx5_core] [<00000000dc741c17>] mlx5e_tc_encap_flows_add+0x489/0x690 [mlx5_core] [<00000000e92e49d7>] mlx5e_rep_update_flows+0x6e4/0x9b0 [mlx5_core] [<00000000f60f5602>] mlx5e_rep_neigh_update+0x39a/0x5d0 [mlx5_core] Fixes: 1ef3018f5af3 ("net/mlx5e: CT: Support clear action") Signed-off-by: Roi Dayan <roid(a)nvidia.com> Reviewed-by: Paul Blakey <paulb(a)nvidia.com> Reviewed-by: Maor Dickman <maord(a)nvidia.com> Signed-off-by: Saeed Mahameed <saeedm(a)nvidia.com> Signed-off-by: Zeng Heng <zengheng4(a)huawei.com> --- .../ethernet/mellanox/mlx5/core/en/tc_ct.c | 26 ++++++++++++------- .../ethernet/mellanox/mlx5/core/en/tc_ct.h | 2 ++ .../net/ethernet/mellanox/mlx5/core/en_tc.c | 8 ++++-- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c index 511c43146562..ce10bbf27e16 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c @@ -1310,9 +1310,13 @@ mlx5_tc_ct_match_add(struct mlx5_tc_ct_priv *priv, int mlx5_tc_ct_parse_action(struct mlx5_tc_ct_priv *priv, struct mlx5_flow_attr *attr, + struct mlx5e_tc_mod_hdr_acts *mod_acts, const struct flow_action_entry *act, struct netlink_ext_ack *extack) { + bool clear_action = act->ct.action & TCA_CT_ACT_CLEAR; + int err; + if (!priv) { NL_SET_ERR_MSG_MOD(extack, "offload of ct action isn't available"); @@ -1323,6 +1327,17 @@ mlx5_tc_ct_parse_action(struct mlx5_tc_ct_priv *priv, attr->ct_attr.ct_action = act->ct.action; attr->ct_attr.nf_ft = act->ct.flow_table; + if (!clear_action) + goto out; + + err = mlx5_tc_ct_entry_set_registers(priv, mod_acts, 0, 0, 0, 0); + if (err) { + NL_SET_ERR_MSG_MOD(extack, "Failed to set registers for ct clear"); + return err; + } + attr->action |= MLX5_FLOW_CONTEXT_ACTION_MOD_HDR; + +out: return 0; } @@ -1890,24 +1905,17 @@ __mlx5_tc_ct_flow_offload_clear(struct mlx5_tc_ct_priv *ct_priv, memcpy(pre_ct_attr, attr, attr_sz); - err = mlx5_tc_ct_entry_set_registers(ct_priv, mod_acts, 0, 0, 0, 0); - if (err) { - ct_dbg("Failed to set register for ct clear"); - goto err_set_registers; - } - mod_hdr = mlx5_modify_header_alloc(priv->mdev, ct_priv->ns_type, mod_acts->num_actions, mod_acts->actions); if (IS_ERR(mod_hdr)) { err = PTR_ERR(mod_hdr); ct_dbg("Failed to add create ct clear mod hdr"); - goto err_set_registers; + goto err_mod_hdr; } dealloc_mod_hdr_actions(mod_acts); pre_ct_attr->modify_hdr = mod_hdr; - pre_ct_attr->action |= MLX5_FLOW_CONTEXT_ACTION_MOD_HDR; rule = mlx5_tc_rule_insert(priv, orig_spec, pre_ct_attr); if (IS_ERR(rule)) { @@ -1923,7 +1931,7 @@ __mlx5_tc_ct_flow_offload_clear(struct mlx5_tc_ct_priv *ct_priv, err_insert: mlx5_modify_header_dealloc(priv->mdev, mod_hdr); -err_set_registers: +err_mod_hdr: netdev_warn(priv->netdev, "Failed to offload ct clear flow, err %d\n", err); kfree(pre_ct_attr); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h index 6503b614337c..50bc0368387b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h @@ -112,6 +112,7 @@ int mlx5_tc_ct_add_no_trk_match(struct mlx5_flow_spec *spec); int mlx5_tc_ct_parse_action(struct mlx5_tc_ct_priv *priv, struct mlx5_flow_attr *attr, + struct mlx5e_tc_mod_hdr_acts *mod_acts, const struct flow_action_entry *act, struct netlink_ext_ack *extack); @@ -173,6 +174,7 @@ mlx5_tc_ct_add_no_trk_match(struct mlx5_flow_spec *spec) static inline int mlx5_tc_ct_parse_action(struct mlx5_tc_ct_priv *priv, struct mlx5_flow_attr *attr, + struct mlx5e_tc_mod_hdr_acts *mod_acts, const struct flow_action_entry *act, struct netlink_ext_ack *extack) { diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index d50f12fb5e19..f7ccca74b789 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -3617,7 +3617,9 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv, attr->dest_chain = act->chain_index; break; case FLOW_ACTION_CT: - err = mlx5_tc_ct_parse_action(get_ct_priv(priv), attr, act, extack); + err = mlx5_tc_ct_parse_action(get_ct_priv(priv), attr, + &parse_attr->mod_hdr_acts, + act, extack); if (err) return err; @@ -4457,7 +4459,9 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, attr->dest_chain = act->chain_index; break; case FLOW_ACTION_CT: - err = mlx5_tc_ct_parse_action(get_ct_priv(priv), attr, act, extack); + err = mlx5_tc_ct_parse_action(get_ct_priv(priv), attr, + &parse_attr->mod_hdr_acts, + act, extack); if (err) return err; -- 2.25.1

2 1

[PATCH OLK-6.6 0/2] fix deadlock in cgroup1_writeback V2
by Chen Ridong 18 Apr '24

18 Apr '24

*** BLURB HERE *** Chen Ridong (2): cgroup_writeback: Revert "fix deadlock in cgroup1_writeback" cgroup_writeback: fix deadlock in cgroup1_writeback mm/backing-dev.c | 7 +++++-- mm/memcontrol.c | 24 ++++++++++-------------- 2 files changed, 15 insertions(+), 16 deletions(-) -- 2.34.1

2 3

[PATCH OLK-6.6 0/2] fix deadlock in cgroup1_writeback
by Chen Ridong 18 Apr '24

18 Apr '24

*** BLURB HERE *** Chen Ridong (2): cgroup_writeback: Revert "fix deadlock in cgroup1_writeback" cgroup_writeback: fix deadlock in cgroup1_writeback mm/backing-dev.c | 7 +++++-- mm/memcontrol.c | 24 +++++++++--------------- 2 files changed, 14 insertions(+), 17 deletions(-) -- 2.34.1

2 3

[PATCH OLK-5.10 v2] net/mlx5: Update error handler for UCTX and UMEM
by Xiang Yang 18 Apr '24

18 Apr '24

From: Neta Ostrovsky <netao(a)nvidia.com> stable inclusion from stable-v5.15.5 commit a51a6da375d82aed5c8f83abd13e7d060421bd48 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9FNF8 CVE: CVE-2021-47212 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- [ Upstream commit ba50cd9451f6c49cf0841c0a4a146ff6a2822699 ] In the fast unload flow, the device state is set to internal error, which indicates that the driver started the destroy process. In this case, when a destroy command is being executed, it should return MLX5_CMD_STAT_OK. Fix MLX5_CMD_OP_DESTROY_UCTX and MLX5_CMD_OP_DESTROY_UMEM to return OK instead of EIO. This fixes a call trace in the umem release process - [ 2633.536695] Call Trace: [ 2633.537518] ib_uverbs_remove_one+0xc3/0x140 [ib_uverbs] [ 2633.538596] remove_client_context+0x8b/0xd0 [ib_core] [ 2633.539641] disable_device+0x8c/0x130 [ib_core] [ 2633.540615] __ib_unregister_device+0x35/0xa0 [ib_core] [ 2633.541640] ib_unregister_device+0x21/0x30 [ib_core] [ 2633.542663] __mlx5_ib_remove+0x38/0x90 [mlx5_ib] [ 2633.543640] auxiliary_bus_remove+0x1e/0x30 [auxiliary] [ 2633.544661] device_release_driver_internal+0x103/0x1f0 [ 2633.545679] bus_remove_device+0xf7/0x170 [ 2633.546640] device_del+0x181/0x410 [ 2633.547606] mlx5_rescan_drivers_locked.part.10+0x63/0x160 [mlx5_core] [ 2633.548777] mlx5_unregister_device+0x27/0x40 [mlx5_core] [ 2633.549841] mlx5_uninit_one+0x21/0xc0 [mlx5_core] [ 2633.550864] remove_one+0x69/0xe0 [mlx5_core] [ 2633.551819] pci_device_remove+0x3b/0xc0 [ 2633.552731] device_release_driver_internal+0x103/0x1f0 [ 2633.553746] unbind_store+0xf6/0x130 [ 2633.554657] kernfs_fop_write+0x116/0x190 [ 2633.555567] vfs_write+0xa5/0x1a0 [ 2633.556407] ksys_write+0x4f/0xb0 [ 2633.557233] do_syscall_64+0x5b/0x1a0 [ 2633.558071] entry_SYSCALL_64_after_hwframe+0x65/0xca [ 2633.559018] RIP: 0033:0x7f9977132648 [ 2633.559821] Code: 89 02 48 c7 c0 ff ff ff ff eb b3 0f 1f 80 00 00 00 00 f3 0f 1e fa 48 8d 05 55 6f 2d 00 8b 00 85 c0 75 17 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 58 c3 0f 1f 80 00 00 00 00 41 54 49 89 d4 55 [ 2633.562332] RSP: 002b:00007fffb1a83888 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 [ 2633.563472] RAX: ffffffffffffffda RBX: 000000000000000c RCX: 00007f9977132648 [ 2633.564541] RDX: 000000000000000c RSI: 000055b90546e230 RDI: 0000000000000001 [ 2633.565596] RBP: 000055b90546e230 R08: 00007f9977406860 R09: 00007f9977a54740 [ 2633.566653] R10: 0000000000000000 R11: 0000000000000246 R12: 00007f99774056e0 [ 2633.567692] R13: 000000000000000c R14: 00007f9977400880 R15: 000000000000000c [ 2633.568725] ---[ end trace 10b4fe52945e544d ]--- conflicts: drivers/net/ethernet/mellanox/mlx5/core/cmd.c Fixes: 6a6fabbfa3e8 ("net/mlx5: Update pci error handler entries and command translation") Signed-off-by: Neta Ostrovsky <netao(a)nvidia.com> Reviewed-by: Leon Romanovsky <leonro(a)nvidia.com> Signed-off-by: Saeed Mahameed <saeedm(a)nvidia.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Xiang Yang <xiangyang3(a)huawei.com> --- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c index 39c17e903915..bb1dba03de7c 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c @@ -338,6 +338,8 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, case MLX5_CMD_OP_DEALLOC_MEMIC: case MLX5_CMD_OP_PAGE_FAULT_RESUME: case MLX5_CMD_OP_QUERY_ESW_FUNCTIONS: + case MLX5_CMD_OP_DESTROY_UCTX: + case MLX5_CMD_OP_DESTROY_UMEM: return MLX5_CMD_STAT_OK; case MLX5_CMD_OP_QUERY_HCA_CAP: @@ -463,9 +465,7 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, case MLX5_CMD_OP_MODIFY_GENERAL_OBJECT: case MLX5_CMD_OP_QUERY_GENERAL_OBJECT: case MLX5_CMD_OP_CREATE_UCTX: - case MLX5_CMD_OP_DESTROY_UCTX: case MLX5_CMD_OP_CREATE_UMEM: - case MLX5_CMD_OP_DESTROY_UMEM: case MLX5_CMD_OP_ALLOC_MEMIC: case MLX5_CMD_OP_MODIFY_XRQ: case MLX5_CMD_OP_RELEASE_XRQ_ERROR: -- 2.34.1

2 1

[PATCH openEuler-1.0-LTS] scsi: advansys: Fix kernel pointer leak
by Jinjiang Tu 18 Apr '24

18 Apr '24

From: Guo Zhi <qtxuning1999(a)sjtu.edu.cn> stable inclusion from stable-v4.19.218 commit f5a0ba4a9b5e70e7b2f767636d26523f9d1ac59d category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9FNFA CVE: CVE-2021-47216 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… ------------------------------------------- [ Upstream commit d4996c6eac4c81b8872043e9391563f67f13e406 ] Pointers should be printed with %p or %px rather than cast to 'unsigned long' and printed with %lx. Change %lx to %p to print the hashed pointer. Link: https://lore.kernel.org/r/20210929122538.1158235-1-qtxuning1999@sjtu.edu.cn Signed-off-by: Guo Zhi <qtxuning1999(a)sjtu.edu.cn> Signed-off-by: Martin K. Petersen <martin.petersen(a)oracle.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Jinjiang Tu <tujinjiang(a)huawei.com> --- drivers/scsi/advansys.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index 713f69033f20..2856b0ce7ab9 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c @@ -3370,8 +3370,8 @@ static void asc_prt_adv_board_info(struct seq_file *m, struct Scsi_Host *shost) shost->host_no); seq_printf(m, - " iop_base 0x%lx, cable_detect: %X, err_code %u\n", - (unsigned long)v->iop_base, + " iop_base 0x%p, cable_detect: %X, err_code %u\n", + v->iop_base, AdvReadWordRegister(iop_base,IOPW_SCSI_CFG1) & CABLE_DETECT, v->err_code); -- 2.25.1

2 1

[PATCH OLK-5.10] Bluetooth: Avoid potential use-after-free in hci_error_reset
by Dong Chenchen 18 Apr '24

18 Apr '24

From: Ying Hsu <yinghsu(a)chromium.org> stable inclusion from stable-v5.10.212 commit 6dd0a9dfa99f8990a08eb8fdd8e79bee31c7d8e2 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9E46O CVE: CVE-2024-26801 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- [ Upstream commit 2449007d3f73b2842c9734f45f0aadb522daf592 ] While handling the HCI_EV_HARDWARE_ERROR event, if the underlying BT controller is not responding, the GPIO reset mechanism would free the hci_dev and lead to a use-after-free in hci_error_reset. Here's the call trace observed on a ChromeOS device with Intel AX201: queue_work_on+0x3e/0x6c __hci_cmd_sync_sk+0x2ee/0x4c0 [bluetooth <HASH:3b4a6>] ? init_wait_entry+0x31/0x31 __hci_cmd_sync+0x16/0x20 [bluetooth <HASH:3b4a 6>] hci_error_reset+0x4f/0xa4 [bluetooth <HASH:3b4a 6>] process_one_work+0x1d8/0x33f worker_thread+0x21b/0x373 kthread+0x13a/0x152 ? pr_cont_work+0x54/0x54 ? kthread_blkcg+0x31/0x31 ret_from_fork+0x1f/0x30 This patch holds the reference count on the hci_dev while processing a HCI_EV_HARDWARE_ERROR event to avoid potential crash. Fixes: c7741d16a57c ("Bluetooth: Perform a power cycle when receiving hardware error event") Signed-off-by: Ying Hsu <yinghsu(a)chromium.org> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Dong Chenchen <dongchenchen2(a)huawei.com> --- net/bluetooth/hci_core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index e33fe4b1c4e2..5f1fbf86e0ce 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -2318,6 +2318,7 @@ static void hci_error_reset(struct work_struct *work) { struct hci_dev *hdev = container_of(work, struct hci_dev, error_reset); + hci_dev_hold(hdev); BT_DBG("%s", hdev->name); if (hdev->hw_error) @@ -2325,10 +2326,10 @@ static void hci_error_reset(struct work_struct *work) else bt_dev_err(hdev, "hardware error 0x%2.2x", hdev->hw_error_code); - if (hci_dev_do_close(hdev)) - return; + if (!hci_dev_do_close(hdev)) + hci_dev_do_open(hdev); - hci_dev_do_open(hdev); + hci_dev_put(hdev); } void hci_uuids_clear(struct hci_dev *hdev) -- 2.25.1

2 1

[PATCH openEuler-1.0-LTS] Bluetooth: Avoid potential use-after-free in hci_error_reset
by Dong Chenchen 18 Apr '24

18 Apr '24

From: Ying Hsu <yinghsu(a)chromium.org> stable inclusion from stable-v4.19.309 commit e0b278650f07acf2e0932149183458468a731c03 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9E46O CVE: CVE-2024-26801 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- [ Upstream commit 2449007d3f73b2842c9734f45f0aadb522daf592 ] While handling the HCI_EV_HARDWARE_ERROR event, if the underlying BT controller is not responding, the GPIO reset mechanism would free the hci_dev and lead to a use-after-free in hci_error_reset. Here's the call trace observed on a ChromeOS device with Intel AX201: queue_work_on+0x3e/0x6c __hci_cmd_sync_sk+0x2ee/0x4c0 [bluetooth <HASH:3b4a6>] ? init_wait_entry+0x31/0x31 __hci_cmd_sync+0x16/0x20 [bluetooth <HASH:3b4a 6>] hci_error_reset+0x4f/0xa4 [bluetooth <HASH:3b4a 6>] process_one_work+0x1d8/0x33f worker_thread+0x21b/0x373 kthread+0x13a/0x152 ? pr_cont_work+0x54/0x54 ? kthread_blkcg+0x31/0x31 ret_from_fork+0x1f/0x30 This patch holds the reference count on the hci_dev while processing a HCI_EV_HARDWARE_ERROR event to avoid potential crash. Fixes: c7741d16a57c ("Bluetooth: Perform a power cycle when receiving hardware error event") Signed-off-by: Ying Hsu <yinghsu(a)chromium.org> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Dong Chenchen <dongchenchen2(a)huawei.com> --- net/bluetooth/hci_core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 94d64cdc8af6..74d5169300ff 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -2200,6 +2200,7 @@ static void hci_error_reset(struct work_struct *work) { struct hci_dev *hdev = container_of(work, struct hci_dev, error_reset); + hci_dev_hold(hdev); BT_DBG("%s", hdev->name); if (hdev->hw_error) @@ -2207,10 +2208,10 @@ static void hci_error_reset(struct work_struct *work) else bt_dev_err(hdev, "hardware error 0x%2.2x", hdev->hw_error_code); - if (hci_dev_do_close(hdev)) - return; + if (!hci_dev_do_close(hdev)) + hci_dev_do_open(hdev); - hci_dev_do_open(hdev); + hci_dev_put(hdev); } void hci_uuids_clear(struct hci_dev *hdev) -- 2.25.1

2 1

[PATCH openEuler-1.0-LTS] gtp: fix use-after-free and null-ptr-deref in gtp_newlink()
by Dong Chenchen 18 Apr '24

18 Apr '24

From: Alexander Ofitserov <oficerovas(a)altlinux.org> stable inclusion from stable-v4.19.309 commit 01129059d5141d62fae692f7a336ae3bc712d3eb category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9E451 CVE: CVE-2024-26793 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit 616d82c3cfa2a2146dd7e3ae47bda7e877ee549e upstream. The gtp_link_ops operations structure for the subsystem must be registered after registering the gtp_net_ops pernet operations structure. Syzkaller hit 'general protection fault in gtp_genl_dump_pdp' bug: [ 1010.702740] gtp: GTP module unloaded [ 1010.715877] general protection fault, probably for non-canonical address 0xdffffc0000000001: 0000 [#1] SMP KASAN NOPTI [ 1010.715888] KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f] [ 1010.715895] CPU: 1 PID: 128616 Comm: a.out Not tainted 6.8.0-rc6-std-def-alt1 #1 [ 1010.715899] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.0-alt1 04/01/2014 [ 1010.715908] RIP: 0010:gtp_newlink+0x4d7/0x9c0 [gtp] [ 1010.715915] Code: 80 3c 02 00 0f 85 41 04 00 00 48 8b bb d8 05 00 00 e8 ed f6 ff ff 48 89 c2 48 89 c5 48 b8 00 00 00 00 00 fc ff df 48 c1 ea 03 <80> 3c 02 00 0f 85 4f 04 00 00 4c 89 e2 4c 8b 6d 00 48 b8 00 00 00 [ 1010.715920] RSP: 0018:ffff888020fbf180 EFLAGS: 00010203 [ 1010.715929] RAX: dffffc0000000000 RBX: ffff88800399c000 RCX: 0000000000000000 [ 1010.715933] RDX: 0000000000000001 RSI: ffffffff84805280 RDI: 0000000000000282 [ 1010.715938] RBP: 000000000000000d R08: 0000000000000001 R09: 0000000000000000 [ 1010.715942] R10: 0000000000000001 R11: 0000000000000001 R12: ffff88800399cc80 [ 1010.715947] R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000400 [ 1010.715953] FS: 00007fd1509ab5c0(0000) GS:ffff88805b300000(0000) knlGS:0000000000000000 [ 1010.715958] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1010.715962] CR2: 0000000000000000 CR3: 000000001c07a000 CR4: 0000000000750ee0 [ 1010.715968] PKRU: 55555554 [ 1010.715972] Call Trace: [ 1010.715985] ? __die_body.cold+0x1a/0x1f [ 1010.715995] ? die_addr+0x43/0x70 [ 1010.716002] ? exc_general_protection+0x199/0x2f0 [ 1010.716016] ? asm_exc_general_protection+0x1e/0x30 [ 1010.716026] ? gtp_newlink+0x4d7/0x9c0 [gtp] [ 1010.716034] ? gtp_net_exit+0x150/0x150 [gtp] [ 1010.716042] __rtnl_newlink+0x1063/0x1700 [ 1010.716051] ? rtnl_setlink+0x3c0/0x3c0 [ 1010.716063] ? is_bpf_text_address+0xc0/0x1f0 [ 1010.716070] ? kernel_text_address.part.0+0xbb/0xd0 [ 1010.716076] ? __kernel_text_address+0x56/0xa0 [ 1010.716084] ? unwind_get_return_address+0x5a/0xa0 [ 1010.716091] ? create_prof_cpu_mask+0x30/0x30 [ 1010.716098] ? arch_stack_walk+0x9e/0xf0 [ 1010.716106] ? stack_trace_save+0x91/0xd0 [ 1010.716113] ? stack_trace_consume_entry+0x170/0x170 [ 1010.716121] ? __lock_acquire+0x15c5/0x5380 [ 1010.716139] ? mark_held_locks+0x9e/0xe0 [ 1010.716148] ? kmem_cache_alloc_trace+0x35f/0x3c0 [ 1010.716155] ? __rtnl_newlink+0x1700/0x1700 [ 1010.716160] rtnl_newlink+0x69/0xa0 [ 1010.716166] rtnetlink_rcv_msg+0x43b/0xc50 [ 1010.716172] ? rtnl_fdb_dump+0x9f0/0x9f0 [ 1010.716179] ? lock_acquire+0x1fe/0x560 [ 1010.716188] ? netlink_deliver_tap+0x12f/0xd50 [ 1010.716196] netlink_rcv_skb+0x14d/0x440 [ 1010.716202] ? rtnl_fdb_dump+0x9f0/0x9f0 [ 1010.716208] ? netlink_ack+0xab0/0xab0 [ 1010.716213] ? netlink_deliver_tap+0x202/0xd50 [ 1010.716220] ? netlink_deliver_tap+0x218/0xd50 [ 1010.716226] ? __virt_addr_valid+0x30b/0x590 [ 1010.716233] netlink_unicast+0x54b/0x800 [ 1010.716240] ? netlink_attachskb+0x870/0x870 [ 1010.716248] ? __check_object_size+0x2de/0x3b0 [ 1010.716254] netlink_sendmsg+0x938/0xe40 [ 1010.716261] ? netlink_unicast+0x800/0x800 [ 1010.716269] ? __import_iovec+0x292/0x510 [ 1010.716276] ? netlink_unicast+0x800/0x800 [ 1010.716284] __sock_sendmsg+0x159/0x190 [ 1010.716290] ____sys_sendmsg+0x712/0x880 [ 1010.716297] ? sock_write_iter+0x3d0/0x3d0 [ 1010.716304] ? __ia32_sys_recvmmsg+0x270/0x270 [ 1010.716309] ? lock_acquire+0x1fe/0x560 [ 1010.716315] ? drain_array_locked+0x90/0x90 [ 1010.716324] ___sys_sendmsg+0xf8/0x170 [ 1010.716331] ? sendmsg_copy_msghdr+0x170/0x170 [ 1010.716337] ? lockdep_init_map_type+0x2c7/0x860 [ 1010.716343] ? lockdep_hardirqs_on_prepare+0x430/0x430 [ 1010.716350] ? debug_mutex_init+0x33/0x70 [ 1010.716360] ? percpu_counter_add_batch+0x8b/0x140 [ 1010.716367] ? lock_acquire+0x1fe/0x560 [ 1010.716373] ? find_held_lock+0x2c/0x110 [ 1010.716384] ? __fd_install+0x1b6/0x6f0 [ 1010.716389] ? lock_downgrade+0x810/0x810 [ 1010.716396] ? __fget_light+0x222/0x290 [ 1010.716403] __sys_sendmsg+0xea/0x1b0 [ 1010.716409] ? __sys_sendmsg_sock+0x40/0x40 [ 1010.716419] ? lockdep_hardirqs_on_prepare+0x2b3/0x430 [ 1010.716425] ? syscall_enter_from_user_mode+0x1d/0x60 [ 1010.716432] do_syscall_64+0x30/0x40 [ 1010.716438] entry_SYSCALL_64_after_hwframe+0x62/0xc7 [ 1010.716444] RIP: 0033:0x7fd1508cbd49 [ 1010.716452] Code: 00 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d ef 70 0d 00 f7 d8 64 89 01 48 [ 1010.716456] RSP: 002b:00007fff18872348 EFLAGS: 00000202 ORIG_RAX: 000000000000002e [ 1010.716463] RAX: ffffffffffffffda RBX: 000055f72bf0eac0 RCX: 00007fd1508cbd49 [ 1010.716468] RDX: 0000000000000000 RSI: 0000000020000280 RDI: 0000000000000006 [ 1010.716473] RBP: 00007fff18872360 R08: 00007fff18872360 R09: 00007fff18872360 [ 1010.716478] R10: 00007fff18872360 R11: 0000000000000202 R12: 000055f72bf0e1b0 [ 1010.716482] R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 [ 1010.716491] Modules linked in: gtp(+) udp_tunnel ib_core uinput af_packet rfkill qrtr joydev hid_generic usbhid hid kvm_intel iTCO_wdt intel_pmc_bxt iTCO_vendor_support kvm snd_hda_codec_generic ledtrig_audio irqbypass crct10dif_pclmul crc32_pclmul crc32c_intel ghash_clmulni_intel snd_hda_intel nls_utf8 snd_intel_dspcfg nls_cp866 psmouse aesni_intel vfat crypto_simd fat cryptd glue_helper snd_hda_codec pcspkr snd_hda_core i2c_i801 snd_hwdep i2c_smbus xhci_pci snd_pcm lpc_ich xhci_pci_renesas xhci_hcd qemu_fw_cfg tiny_power_button button sch_fq_codel vboxvideo drm_vram_helper drm_ttm_helper ttm vboxsf vboxguest snd_seq_midi snd_seq_midi_event snd_seq snd_rawmidi snd_seq_device snd_timer snd soundcore msr fuse efi_pstore dm_mod ip_tables x_tables autofs4 virtio_gpu virtio_dma_buf drm_kms_helper cec rc_core drm virtio_rng virtio_scsi rng_core virtio_balloon virtio_blk virtio_net virtio_console net_failover failover ahci libahci libata evdev scsi_mod input_leds serio_raw virtio_pci intel_agp [ 1010.716674] virtio_ring intel_gtt virtio [last unloaded: gtp] [ 1010.716693] ---[ end trace 04990a4ce61e174b ]--- Cc: stable(a)vger.kernel.org Signed-off-by: Alexander Ofitserov <oficerovas(a)altlinux.org> Fixes: 459aa660eb1d ("gtp: add initial driver for datapath of GPRS Tunneling Protocol (GTP-U)") Reviewed-by: Jiri Pirko <jiri(a)nvidia.com> Link: https://lore.kernel.org/r/20240228114703.465107-1-oficerovas@altlinux.org Signed-off-by: Paolo Abeni <pabeni(a)redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Dong Chenchen <dongchenchen2(a)huawei.com> --- drivers/net/gtp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index bf0560035573..7e950980ba73 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -1374,26 +1374,26 @@ static int __init gtp_init(void) get_random_bytes(&gtp_h_initval, sizeof(gtp_h_initval)); - err = rtnl_link_register(&gtp_link_ops); + err = register_pernet_subsys(&gtp_net_ops); if (err < 0) goto error_out; - err = register_pernet_subsys(&gtp_net_ops); + err = rtnl_link_register(&gtp_link_ops); if (err < 0) - goto unreg_rtnl_link; + goto unreg_pernet_subsys; err = genl_register_family(&gtp_genl_family); if (err < 0) - goto unreg_pernet_subsys; + goto unreg_rtnl_link; pr_info("GTP module loaded (pdp ctx size %zd bytes)\n", sizeof(struct pdp_ctx)); return 0; -unreg_pernet_subsys: - unregister_pernet_subsys(&gtp_net_ops); unreg_rtnl_link: rtnl_link_unregister(&gtp_link_ops); +unreg_pernet_subsys: + unregister_pernet_subsys(&gtp_net_ops); error_out: pr_err("error loading GTP module loaded\n"); return err; -- 2.25.1

2 1