@@ -6436,32 +6436,32 @@ static int
64366436bpf_object__append_subprog_code (struct  bpf_object  * obj , struct  bpf_program  * main_prog ,
64376437				struct  bpf_program  * subprog )
64386438{
6439-         struct  bpf_insn  * insns ;
6440-         size_t  new_cnt ;
6441-         int  err ;
6442- 
6443-         subprog -> sub_insn_off  =  main_prog -> insns_cnt ;
6444- 
6445-         new_cnt  =  main_prog -> insns_cnt  +  subprog -> insns_cnt ;
6446-         insns  =  libbpf_reallocarray (main_prog -> insns , new_cnt , sizeof (* insns ));
6447-         if  (!insns ) {
6448-                 pr_warn ("prog '%s': failed to realloc prog code\n" , main_prog -> name );
6449-                 return  - ENOMEM ;
6450-         }
6451-         main_prog -> insns  =  insns ;
6452-         main_prog -> insns_cnt  =  new_cnt ;
6453- 
6454-         memcpy (main_prog -> insns  +  subprog -> sub_insn_off , subprog -> insns ,
6455-                subprog -> insns_cnt  *  sizeof (* insns ));
6456- 
6457-         pr_debug ("prog '%s': added %zu insns from sub-prog '%s'\n" ,
6458-                  main_prog -> name , subprog -> insns_cnt , subprog -> name );
6459- 
6460-         /* The subprog insns are now appended. Append its relos too. */ 
6461-         err  =  append_subprog_relos (main_prog , subprog );
6462-         if  (err )
6463-                 return  err ;
6464-         return  0 ;
6439+ 	 struct  bpf_insn  * insns ;
6440+ 	 size_t  new_cnt ;
6441+ 	 int  err ;
6442+ 
6443+ 	 subprog -> sub_insn_off  =  main_prog -> insns_cnt ;
6444+ 
6445+ 	 new_cnt  =  main_prog -> insns_cnt  +  subprog -> insns_cnt ;
6446+ 	 insns  =  libbpf_reallocarray (main_prog -> insns , new_cnt , sizeof (* insns ));
6447+ 	 if  (!insns ) {
6448+ 		 pr_warn ("prog '%s': failed to realloc prog code\n" , main_prog -> name );
6449+ 		 return  - ENOMEM ;
6450+ 	 }
6451+ 	 main_prog -> insns  =  insns ;
6452+ 	 main_prog -> insns_cnt  =  new_cnt ;
6453+ 
6454+ 	 memcpy (main_prog -> insns  +  subprog -> sub_insn_off , subprog -> insns ,
6455+ 	        subprog -> insns_cnt  *  sizeof (* insns ));
6456+ 
6457+ 	 pr_debug ("prog '%s': added %zu insns from sub-prog '%s'\n" ,
6458+ 		  main_prog -> name , subprog -> insns_cnt , subprog -> name );
6459+ 
6460+ 	 /* The subprog insns are now appended. Append its relos too. */ 
6461+ 	 err  =  append_subprog_relos (main_prog , subprog );
6462+ 	 if  (err )
6463+ 		 return  err ;
6464+ 	 return  0 ;
64656465}
64666466
64676467static  int 
0 commit comments